From: Junio C Hamano Date: Wed, 11 Jan 2006 19:29:58 GMT Subject: Re: Checking git-cherry-pick Use Case Message-ID: <7v3bjuv9zd.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <1136997967.29751.198.camel@cashmere.sps.mot.com> Jon Loeliger writes: > My first question is that I expected to see > something more like this (hand edited): > > ! [dev] Stuff jdl made up and committed > * [jdl] Early stuff jdl made up > ! [origin] Original stuff > --- > ++ [dev] Stuff jdl made up and committed > + [dev^] Merge branch 'jdl' > ++ [jdl^] Early stuff jdl made up > +++ [origin] Original stuff > > That is, the _same_ commit is now in both the "dev" > and "jdl" branches, so why does it have two lines here? Because they are not the same commit; they are two separate commits, that happen to have the same commit log message and authorship information, and perhaps even result to show the same "diff" if asked by 1-parameter git-diff-tree, but they are different commit objects nevertheless. Funnily enough, I think I sent out almost exactly the same message as yours the last couple of days regarding workflows, after I hacked a bit on gitweb ;-).