Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Checking git-cherry-pick Use Case

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:16

Jon Loeliger [off-list ref] 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 ;-).
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help