summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-07 15:46:01 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-07 15:46:01 -0700
commit4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7 (patch)
treefde780652a6a3f3249bdef0062a86f5016bb7d5d /Documentation/git-commit.txt
parent624016114ed96ebdbd896c51d68f15790d834042 (diff)
parent3334729cf29605389b51effc1f311656f3fd8086 (diff)
downloadgit-4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7.tar.gz
Merge branch 'maint'
* maint: commit.txt: clarify how --author argument is used
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 32c482f33f..c28603ecf5 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -95,10 +95,11 @@ OPTIONS
read the message from the standard input.
--author=<author>::
- 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.
+ Override the commit author. Specify an explicit author using the
+ standard `A U Thor <author@example.com>` format. Otherwise <author>
+ is assumed to be a pattern and is used to search for an existing
+ commit by that author (i.e. rev-list --all -i --author=<author>);
+ the commit author is then copied from the first such commit found.
--date=<date>::
Override the author date used in the commit.