Re: Checking git-cherry-pick Use Case

From: Junio C Hamano <junkio@cox.net>
Date: 2006-01-12 06:29:58
Jon Loeliger <jdl@freescale.com> 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 ;-).

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Received on Thu Jan 12 06:30:36 2006

This archive was generated by hypermail 2.1.8 : 2006-01-12 06:30:44 EST