path: root/
diff options
authorShawn O. Pearce <>2007-01-15 06:41:22 (GMT)
committerJunio C Hamano <>2007-01-15 07:17:32 (GMT)
commit6e2931a8ed887bd75ed68085a7e04bc88574d69e (patch)
treea88c0de8e369cbf70b17fbe123305441d70f4c8f /
parentacb4441e0dabaaa666ecae11fdafc27c3691e763 (diff)
Use nice names in conflict markers during cherry-pick/revert.
Always call the current HEAD 'HEAD', and name the patch being cherry-picked or reverted by its oneline subject rather than its SHA1. This matches git am's behavior and is done because users most commonly are cherry-picking by SHA1 rather than by ref name. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 6 insertions, 0 deletions
diff --git a/ b/
index c74af99..bb8f1ca 100755
--- a/
+++ b/
@@ -146,6 +146,12 @@ cherry-pick)
esac >.msg
+eval GITHEAD_$head=HEAD
+eval GITHEAD_$next='`git show -s \
+ --pretty=oneline --encoding="$encoding" "$commit" |
+ sed -e "s/^[^ ]* //"`'
+export GITHEAD_$head GITHEAD_$next
# This three way merge is an interesting one. We are at
# $head, and would want to apply the change between $commit
# and $prev on top of us (when reverting), or the change between