From: Junio C Hamano Date: Sat, 29 Sep 2007 22:08:38 GMT Subject: Re: [PATCH] rebase -i: support single-letter abbreviations for the actions Message-ID: <7vzlz5jfa1.fsf@gitster.siamese.dyndns.org> In-Reply-To: Johannes Schindelin writes: > On Sat, 29 Sep 2007, Avi Kivity wrote: > >> > > Can we make "amend" like squash, except that it keeps the first >> > > commit's authorship instead of the second? I often merge a commit >> > > with some minor fix that comes later, and usually want to keep the >> > > original author record. > > Thinking about this again... Maybe it is a better semantics anyway? What > do others think? I never thought about whose commit the squashed ones become before this thread, but making squash quack as if "commit --amend" was done after running "cherry-pick -n" the second and later ones feels like the most natural semantics to me.