diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-28 04:47:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-28 04:47:38 (GMT) |
| commit | 5736a3747120d6215de4fdfcf45f4a168a8d024e (patch) | |
| tree | 0549814532ce97e4931fe2a0e915edf507c41050 /builtin-commit.c | |
| parent | 1ce89cc4bb18b0e66f7073562d6634f6a9841335 (diff) | |
| parent | 362b0dd523f5162e7c55c76b5d0af7ad830e0e83 (diff) | |
| download | git-5736a3747120d6215de4fdfcf45f4a168a8d024e.zip git-5736a3747120d6215de4fdfcf45f4a168a8d024e.tar.gz git-5736a3747120d6215de4fdfcf45f4a168a8d024e.tar.bz2 | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
Remove 'header' from --signoff option description
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 05dfc69..52a05c2 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -90,7 +90,7 @@ static struct option builtin_commit_options[] = { OPT_CALLBACK('m', "message", &message, "MESSAGE", "specify commit message", opt_parse_m), OPT_STRING('c', "reedit-message", &edit_message, "COMMIT", "reuse and edit message from specified commit "), OPT_STRING('C', "reuse-message", &use_message, "COMMIT", "reuse message from specified commit"), - OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by: header"), + OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"), OPT_STRING('t', "template", &template_file, "FILE", "use specified template file"), OPT_BOOLEAN('e', "edit", &edit_flag, "force edit of commit"), |