From: Junio C Hamano Date: Sun, 19 Oct 2008 22:53:46 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.6.1-rc1~136 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3aa615bc5d5348d732b5b1354cc3517a55b34a6f?hp=-c Merge branch 'maint' * maint: Documentation: Clarify '--signoff' for git-commit --- 3aa615bc5d5348d732b5b1354cc3517a55b34a6f diff --combined Documentation/git-commit.txt index eb05b0f49b,79be4f1c00..41809eecab --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@@ -75,10 -75,8 +75,10 @@@ OPTION read the message from the standard input. --author=:: - Override the author name used in the commit. Use - `A U Thor ` format. + Override the author name used in the commit. You can use the + standard `A U Thor ` format. Otherwise, + an existing commit that matches the given string and its author + name is used. -m :: --message=:: @@@ -94,7 -92,8 +94,8 @@@ -s:: --signoff:: - Add Signed-off-by line at the end of the commit message. + Add Signed-off-by line by the commiter at the end of the commit + log message. -n:: --no-verify::