From: Junio C Hamano Date: Wed, 16 Feb 2011 01:04:39 GMT Subject: Re: [PATCH] Documentation: clarify interaction of --reset-author with --author Message-ID: <7vhbc4lrh4.fsf@alter.siamese.dyndns.org> In-Reply-To: <20110216000553.GB18151@elie> Jonathan Nieder writes: > The --author and --date options override the author and date from > --reset-author. > > Signed-off-by: Jonathan Nieder > --- > Jonathan Nieder wrote: > >> Patch below. > > Sane? The option is about reusing only the message and determine authorship information from usual means, so in that sense it is sane. A command line "commit -C $that_one --reset-author --date=yesterday --author=$him" would make sense in practice, but if you give both explicitly, you don't need an explicit --reset-author anymore, so overall it makes sense in a funny way. > 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