[PATCH] Documentation: clarify interaction of --reset-author with --author
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Feb 16, 2011, 00:05 UTC
- Message-ID
- <20110216000553.GB18151@elie>
- In-Reply-To
- <20110215234735.GA18151@elie>
The --author and --date options override the author and date from --reset-author.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Jonathan Nieder wrote:
> Patch below.
Sane?
Documentation/git-commit.txt | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index b586c0f..f766d53 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -84,9 +84,12 @@ OPTIONS linkgit:git-rebase[1] for details. --reset-author:: - When used with -C/-c/--amend options, declare that the - authorship of the resulting commit now belongs of the committer. + Despite use of the -c, -C, or --amend option, declare that the + authorship of the new commit belongs to the committer. This also renews the author timestamp. ++ +Can be combined with `--author` or `--date` to claim authorship using +some specific name and email address or date. --short:: When doing a dry-run, give the output in the short-format. See
-- 1.7.4.1