Use nice names in conflict markers during cherry-pick/revert.
PATCH 1/1 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 <[email protected]>
---
This is on top of your prior patch "Use merge-recursive in git-revert/git-cherry-pick".
git-revert.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
git-revert.sh +6 -0
@@ -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
Signature · 1 line
1.5.0.rc1.g4494