{"thread":{"id":"4845","subject":"Log ref changes made by resolve.","startedAt":"2006-07-11T06:25:09Z","lastAt":"2006-07-11T06:25:09Z","messageCount":1,"participants":["Shawn Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"23618","messageId":"20060711062509.GC11822@spearce.org","threadId":"4845","inReplyTo":null,"subject":"Log ref changes made by resolve.","fromName":"Shawn Pearce","fromEmail":"spearce@spearce.org","sentAt":"2006-07-11T06:25:09Z","receivedAt":"2006-07-11T06:25:09Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Since git-resolve is essentially a form of git-merge record any\nref updates it makes similiar to how git-merge would record them.\n\nSigned-off-by: Shawn O. Pearce <spearce@spearce.org>\n---\n I have to ask:  Should git-resolve just be calling git-merge?  It\n does a fraction of what git-merge does yet it also can do the\n basic fast-forward and in-index merge that git-merge does...\n\n git-resolve.sh |    7 +++++--\n 1 files changed, 5 insertions(+), 2 deletions(-)\n\ndiff --git a/git-resolve.sh b/git-resolve.sh\nindex 1c7aaef..a7bc680 100755\n--- a/git-resolve.sh\n+++ b/git-resolve.sh\n@@ -15,6 +15,7 @@ dropheads() {\n \n head=$(git-rev-parse --verify \"$1\"^0) &&\n merge=$(git-rev-parse --verify \"$2\"^0) &&\n+merge_name=\"$2\" &&\n merge_msg=\"$3\" || usage\n \n #\n@@ -43,7 +44,8 @@ case \"$common\" in\n \"$head\")\n \techo \"Updating from $head to $merge\"\n \tgit-read-tree -u -m $head $merge || exit 1\n-\tgit-update-ref HEAD \"$merge\" \"$head\"\n+\tgit-update-ref -m \"resolve $merge_name: Fast forward\" \\\n+\t\tHEAD \"$merge\" \"$head\"\n \tgit-diff-tree -p $head $merge | git-apply --stat\n \tdropheads\n \texit 0\n@@ -100,6 +102,7 @@ if [ $? -ne 0 ]; then\n fi\n result_commit=$(echo \"$merge_msg\" | git-commit-tree $result_tree -p $head -p $merge)\n echo \"Committed merge $result_commit\"\n-git-update-ref HEAD \"$result_commit\" \"$head\"\n+git-update-ref -m \"resolve $merge_name: In-index merge\" \\\n+\tHEAD \"$result_commit\" \"$head\"\n git-diff-tree -p $head $result_commit | git-apply --stat\n dropheads\n-- \n1.4.1.gc48f\n"}]}