diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2011-02-15 14:09:12 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-15 11:53:10 -0800 |
| commit | 23c6a803d3e6523ec20154e30ae8a51d2ff998ca (patch) | |
| tree | fcbff76c12c32e555db569b28f484f12ffdd075d /builtin/merge.c | |
| parent | Make <identifier> lowercase as per CodingGuidelines (diff) | |
| download | tgif-23c6a803d3e6523ec20154e30ae8a51d2ff998ca.tar.xz | |
Make <identifier> lowercase as per CodingGuidelines
*.c part for matches with '"[A-Z]+"'.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index a682043fe5..7b0b4d5286 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -194,7 +194,7 @@ static struct option builtin_merge_options[] = { "merge strategy to use", option_parse_strategy), OPT_CALLBACK('X', "strategy-option", &xopts, "option=value", "option for selected merge strategy", option_parse_x), - OPT_CALLBACK('m', "message", &merge_msg, "MESSAGE", + OPT_CALLBACK('m', "message", &merge_msg, "message", "merge commit message (for a non-fast-forward merge)", option_parse_message), OPT__VERBOSITY(&verbosity), |