{"thread":{"id":"6388","subject":"[PATCH] Use nice names in conflict markers during cherry-pick/revert.","startedAt":"2007-01-15T06:41:22Z","lastAt":"2007-01-15T06:41:22Z","messageCount":1,"participants":["Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"31753","messageId":"20070115064122.GA12372@spearce.org","threadId":"6388","inReplyTo":null,"subject":"[PATCH] Use nice names in conflict markers during cherry-pick/revert.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-15T06:41:22Z","receivedAt":"2007-01-15T06:41:22Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Always call the current HEAD 'HEAD', and name the patch being\ncherry-picked or reverted by its oneline subject rather than\nits SHA1.  This matches git am's behavior and is done because\nusers most commonly are cherry-picking by SHA1 rather than by\nref name.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n\n This is on top of your prior patch \"Use merge-recursive in\n git-revert/git-cherry-pick\".\n\n git-revert.sh |    6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ndiff --git a/git-revert.sh b/git-revert.sh\nindex c74af99..bb8f1ca 100755\n--- a/git-revert.sh\n+++ b/git-revert.sh\n@@ -146,6 +146,12 @@ cherry-pick)\n \n esac >.msg\n \n+eval GITHEAD_$head=HEAD\n+eval GITHEAD_$next='`git show -s \\\n+\t--pretty=oneline --encoding=\"$encoding\" \"$commit\" |\n+\tsed -e \"s/^[^ ]* //\"`'\n+export GITHEAD_$head GITHEAD_$next\n+\n # This three way merge is an interesting one.  We are at\n # $head, and would want to apply the change between $commit\n # and $prev on top of us (when reverting), or the change between\n-- \n1.5.0.rc1.g4494\n"}]}