From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jun 2010 22:46:01 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7?ds=inline;hp=-c

Merge branch 'maint'

* maint:
commit.txt: clarify how --author argument is used
---

4a2b34eb0ca6ce740478bc4f57226c30cc0d25a7
diff --combined Documentation/git-commit.txt
index 32c482f33f,69eb86e450..c28603ecf5
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -10,7 -10,7 +10,7 @@@ SYNOPSI
  [verse]
  'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
  	   [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
 -	   [--allow-empty] [--no-verify] [-e] [--author=<author>]
 +	   [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
  	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--]
  	   [[-i | -o ]<file>...]
  
@@@ -95,10 -95,11 +95,11 @@@ OPTION
  	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.
@@@ -131,12 -132,6 +132,12 @@@
  	from making such a commit.  This option bypasses the safety, and
  	is primarily for use by foreign scm interface scripts.
  
 +--allow-empty-message::
 +       Like --allow-empty this command is primarily for use by foreign
 +       scm interface scripts. It allows you to create a commit with an
 +       empty commit message without using plumbing commands like
 +       linkgit:git-commit-tree[1].
 +
  --cleanup=<mode>::
  	This option sets how the commit message is cleaned up.
  	The  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',