| commit | bf975d379d79ab0eb9e8835af4abab4712e71dad | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 21 Mar 2010 00:46:07 +0000 (20 19:46 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Mar 2010 03:36:11 +0000 (20 20:36 -0700) | ||
| tree | baf1f251aad5ba058643a67edba4885c1bbe9144 | treesnapshot (tar.gz zip) |
| parent | d68565402a69fac3fe0e0653718feca7c80c178b | commitdiff |
cherry-pick, revert: add a label for ancestor
When writing conflict hunks in ‘diff3 -m’ format, also add a label to
the common ancestor. Especially in a cherry-pick, it is not immediately
obvious without such a label what the common ancestor represents.
git rerere does not have trouble parsing the new output and its preimage
ids are unchanged since it includes its own code for recreating conflict
hunks. No other code in git parses conflict hunks.
Requested-by: Stefan Monnier <monnier@iro.umontreal.ca>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When writing conflict hunks in ‘diff3 -m’ format, also add a label to
the common ancestor. Especially in a cherry-pick, it is not immediately
obvious without such a label what the common ancestor represents.
git rerere does not have trouble parsing the new output and its preimage
ids are unchanged since it includes its own code for recreating conflict
hunks. No other code in git parses conflict hunks.
Requested-by: Stefan Monnier <monnier@iro.umontreal.ca>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/revert.c | diffblobblamehistory | |
| t/t3507-cherry-pick-conflict.sh | diffblobblamehistory |