diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-01-15 01:41:22 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-01-14 23:17:32 -0800 |
| commit | 6e2931a8ed887bd75ed68085a7e04bc88574d69e (patch) | |
| tree | a88c0de8e369cbf70b17fbe123305441d70f4c8f | |
| parent | Use merge-recursive in git-revert/git-cherry-pick (diff) | |
| download | tgif-6e2931a8ed887bd75ed68085a7e04bc88574d69e.tar.xz | |
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 <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-revert.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-revert.sh b/git-revert.sh index c74af99a51..bb8f1ca24a 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -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 |