From: Jeff King <peff@peff.net>
Date: Tue, 11 Jan 2011 05:34:51 GMT
Subject: Re: [PATCH] commit: suggest --amend --reset-author to fix commiter identity
Message-ID: <20110111053451.GA10094@sigill.intra.peff.net>
In-Reply-To: <vpq1v4nirzz.fsf@bauges.imag.fr>

On Sat, Jan 08, 2011 at 11:56:00AM +0100, Matthieu Moy wrote:

> > Wouldn't it work better to just get rid of the longer form and say
> > something like:
> >
> >     ... here is how to tell your name to git (existing message) ...
> >
> >     After doing the above, run
> >
> >     	git commit --amend --reset-author
> >
> >     to fix the identity used for this commit.
> 
> I'm fine with that proposal too. I'll resend with that if no one
> objects. Probalby rewording it to

Hmm.  When I originally wrote that message, I specifically avoided using
--reset-author because I figured people would want to most immediately
fix the broken commit, and then maybe would not be too lazy to fix
things for the future. But that was just a hunch, and I don't feel
strongly about it.

I was also afraid of people blindly running the fixup command without
doing the configuration specified in the commands above. However, I
think as long as the text makes it clear that one depends on the other,
it should be OK. So something like:

> After doing this, you can fix the identity used for this commit with:
> 
>   git commit --amend --reset-author

looks fine to me.

-Peff