From: Sverre Rabbelier Date: Mon, 30 Nov 2009 09:26:22 GMT Subject: Re: [PATCH v3] Give the hunk comment its own color Message-ID: In-Reply-To: <7vvdgstmic.fsf@alter.siamese.dyndns.org> Heya, On Mon, Nov 30, 2009 at 10:00, Junio C Hamano wrote: > I maintain a private 'jch' branch that merges everything that has been > merged so far to 'next' and the branch always builds on top of 'master' > whenever 'pu' is pushed out.  The tree object recorded by the tip of 'jch' > is designed to always match that of 'next'.  And 'pu' is built on top of > 'jch', instead of 'next', these days. Ah, so _that''s_ how you pull of not rebasing and still maintaining a clean history in master: keeping a private shadow branch with the cleaned up history that is tree-identical to the no-rebase next branch. Interesting. > The end result is that the commit merged in 'next' is not the tip of > bw/diff-color-hunk-header anymore, but merging the _current_ tip of that > branch together with all the other topics on top of 'master' would produce > the desired result without "oops---that was a stupid typo" fixups. Thanks for explaining, git really does allow for a lot of interesting workflows :). -- Cheers, Sverre Rabbelier