Skip to content

Commit

Permalink
Merge branch 'maint-1.5.4' into maint
Browse files Browse the repository at this point in the history
* maint-1.5.4:
  Remove 'header' from --signoff option description
  • Loading branch information
Junio C Hamano committed Apr 28, 2008
2 parents 1ce89cc + 362b0dd commit 5736a37
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin-commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"),

Expand Down

0 comments on commit 5736a37

Please sign in to comment.