{"thread":{"id":"8466","subject":"[PATCH] git-merge: record merge strategy in the log message on auto resolved merges","startedAt":"2007-06-06T08:24:28Z","lastAt":"2007-06-06T08:24:28Z","messageCount":1,"participants":["Gerrit Pape"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"44139","messageId":"20070606082428.10588.qmail@3eecbb0978967b.315fe32.mid.smarden.org","threadId":"8466","inReplyTo":null,"subject":"[PATCH] git-merge: record merge strategy in the log message on auto resolved merges","fromName":"Gerrit Pape","fromEmail":"pape@smarden.org","sentAt":"2007-06-06T08:24:28Z","receivedAt":"2007-06-06T08:24:28Z","isPatch":true,"sender":{"key":"pape@smarden.org","avatar":"https://avatars.githubusercontent.com/u/143170252?v=4"},"body":"If a strategy module auto resolved the merge cleanly, record the used\nstrategy in the log message, e.g.:\n\n  Merge branch 'maint' using strategy ours\n\nSigned-off-by: Gerrit Pape <pape@smarden.org>\n---\n\nI personally find this useful especially for the 'ours' strategy.\n\n git-merge.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 981d69d..b661f74 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -440,7 +440,8 @@ done\n if test '' != \"$result_tree\"\n then\n     parents=$(git-show-branch --independent \"$head\" \"$@\" | sed -e 's/^/-p /')\n-    result_commit=$(printf '%s\\n' \"$merge_msg\" | git-commit-tree $result_tree $parents) || exit\n+    result_commit=$(printf '%s\\n' \"$merge_msg using strategy $wt_strategy\" |\n+\tgit-commit-tree $result_tree $parents) || exit\n     finish \"$result_commit\" \"Merge made by $wt_strategy.\"\n     dropsave\n     exit 0\n-- \n1.5.2\n"}]}