summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-03 00:45:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-03 00:45:28 (GMT)
commit1c12b38601b5b4da61a2e90540a8de56261d93af (patch)
tree8e08f3c26cd54c859d1e58c742e75aa2d53cc932 /Documentation
parent14e8607c4129b4470f46f6f59e29103f620f3a73 (diff)
parent146ea068a0434a7423d8b0d77f27ccff0a584ac4 (diff)
downloadgit-1c12b38601b5b4da61a2e90540a8de56261d93af.zip
git-1c12b38601b5b4da61a2e90540a8de56261d93af.tar.gz
git-1c12b38601b5b4da61a2e90540a8de56261d93af.tar.bz2
Merge branch 'jc/author-nickname'
* jc/author-nickname: git commit --author=$name: look $name up in existing commits
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0e25bb8..eb05b0f 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -75,8 +75,10 @@ OPTIONS
read the message from the standard input.
--author=<author>::
- Override the author name used in the commit. Use
- `A U Thor <author@example.com>` format.
+ Override the author name used in the commit. You can use the
+ standard `A U Thor <author@example.com>` format. Otherwise,
+ an existing commit that matches the given string and its author
+ name is used.
-m <msg>::
--message=<msg>::