Re: git merge after git cherry-pick?

[Jakub Narebski <jnareb@gmail.com>]

"Peter Valdemar Mørch (Lists)"    <4ux6as402@sneakemail.com> writes:

> On a branch, b, made off of master, I've made the commits b1, b2, b3
> and b4.
> 
> Back on master, I need commit b1 and b3 immediately. So I:
> 
> $ git checkout master
> $ git cherry-pick "b1's SHA"
> $ git cherry-pick "b3's SHA"
> 
> Now, both b and master contain b1 and b3. How do I now create a log of
> "what remains to be merged from b to master", i.e. only b2 and b4?

You can use "git cherry master b" command (or just "git cherry master"
if you are on branch 'b') to check which commits (based on patch id)
on branch 'b are already present on branch 'master'.

Alternatively you can use "git log --left-right master...b" to check
which comits are on which branch, although I think it wouldn't mark
duplicated commits.

> And how do I merge b2 and b4 to master, so master's log shows b1,
> b3, b2 and b4 and doesn't show b1 and b3 twice, which is what I get
> if I:
> 
> $ git merge b
> 
> after the cherry-picks above. Also I noticed, that if I merge master
> into b (to keep up-to-date with master) b1 and b3 are also mentioned
> twice.

You can instead of merging branch 'b' into master rebase it on top of
master.

This would create instead of the following history (for merge):

   ---*---b1'---b3'--------------M         <-- master
       \                        /
        \-b1----b2----b3----b4-/           <-- b

the following

   ---*---b1'---b3'---b1'---b4'            <-- master, b
       .                        
        ..b1....b2....b3....b4             <.. b@{1} (reflog)         

[cut]

HTH
-- 
Jakub Narebski
Poland
ShadeHawk on #git