Johannes Sixt j.s...@viscovery.net 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
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
Kacper Kornet drae...@pld-linux.org 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).
+
On Tue, Nov 27, 2012 at 06:18:00PM -0800, Junio C Hamano wrote:
Kacper Kornet drae...@pld-linux.org 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
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
5 matches
Mail list logo