From: Junio C Hamano Date: Tue, 16 Feb 2010 23:59:51 GMT Subject: Re: [RFC PATCH v2 01/11] Documentation: document post-rewrite hook Message-ID: <7vd404zq88.fsf@alter.siamese.dyndns.org> In-Reply-To: <8ee58b83a10dcb302a33136768039729fbebae53.1266361759.git.trast@student.ethz.ch> Thomas Rast writes: > +rebase:: > + For the 'squash' and 'fixup' operation, all commits that were > + squashed are listed as being rewritten to the squashed commit. > + This means that there will be several lines sharing the same > + 'new-sha1'. Similar to filter-branch being silent on dropped commits, I presume "rebase -i" will stay silent if a pick is removed, or rebase --skip is given. I wondered if squash/fixup case wants to distinguish the "primary" commit and "follow-up" fixup commits (not a complaint, but thinking-aloud), but I think the rebase command itself and this hook have the same amount of information needed to guess which one is the primary and which ones are the follow ups, so it probably is Ok. Is the order of input lines guaranteed in some way? For example, if I run rebase to make A B C into A' and B+C, do we get these three lines: A -> A' B -> B+C C -> B+C in some known order? If so, should we document that order?