Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

Johannes Sixt writes: > 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 > > Th

Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

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

Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

On Tue, Nov 27, 2012 at 06:18:00PM -0800, Junio C Hamano wrote: > Kacper Kornet writes: > > +--transpose-parents:: > > + Transpose the parents in the final commit. The change is made > > + just before the commit so the meaning of 'our' and 'their' > > + concepts remains the same (i.e. 'our'

Re: [PATCH v2 3/3] Add option to transpose parents of merge commit

Kacper Kornet writes: > +--transpose-parents:: > + Transpose the parents in the final commit. The change is made > + just before the commit so the meaning of 'our' and 'their' > + concepts remains the same (i.e. 'our' means current branch before > + the merge). > + How does this

[PATCH v2 3/3] Add option to transpose parents of merge commit

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 where B is the local commit. D, E are commits pushed by someone else when the developer was wor