Am 11/28/2012 0:00, schrieb Kacper Kornet:
> When the changes are pushed upstream, and in the meantime someone else
> updated upstream branch git advises to use git pull. This results in
> history:
>
> ---A---B---C--
> \ /
> D---E
The commit message will say:
Merge branch 'master' of /that/remote
* 'master' of /that/remote:
E
D
> where B is the local commit. D, E are commits pushed by someone else
> when the developer was working on B. However sometimes the following
> history is preferable:
>
> ---A---D---C'--
> \ /
> '-B-'
Better:
---A--D--E--C'
\ /
`----B
In this case, the commit message should say... what? Certainly not the
same thing. But I do not see that you changed anything in this regard.
-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html