{"thread":{"id":"8710","subject":"[PATCH] git-merge: record merge strategy in the log message on auto resolved merges","startedAt":"2007-06-25T07:16:23Z","lastAt":"2007-06-25T07:53:46Z","messageCount":3,"participants":["Gerrit Pape","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"45742","messageId":"20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org","threadId":"8710","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-25T07:16:23Z","receivedAt":"2007-06-25T07:16:23Z","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\n> I personally find this useful especially for the 'ours' strategy.\nResend, maybe it's not that interesting, there was no followup when sent\nthe first time.\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"},{"id":"45748","messageId":"7vk5ts1ni4.fsf@assigned-by-dhcp.pobox.com","threadId":"8710","inReplyTo":"20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org","subject":"Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-06-25T07:50:27Z","receivedAt":"2007-06-25T07:50:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Gerrit Pape <pape@smarden.org> writes:\n\n> If a strategy module auto resolved the merge cleanly, record the used\n> strategy in the log message, e.g.:\n>\n>   Merge branch 'maint' using strategy ours\n>\n> Signed-off-by: Gerrit Pape <pape@smarden.org>\n> ---\n>\n>> I personally find this useful especially for the 'ours' strategy.\n\nI really do not think we want to do this, especially when the\nuser did not specify anything unusual like \"ours\".\n\nAt least, exclude recursive and octopus out of it, please.\n"},{"id":"45751","messageId":"Pine.LNX.4.64.0706250852470.4059@racer.site","threadId":"8710","inReplyTo":"20070625071624.7919.qmail@82fa8ed4561cac.315fe32.mid.smarden.org","subject":"Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-06-25T07:53:46Z","receivedAt":"2007-06-25T07:53:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 25 Jun 2007, Gerrit Pape wrote:\n\n> If a strategy module auto resolved the merge cleanly, record the used\n> strategy in the log message\n\nWhy only when it merged cleanly? If that information is useful, it is \n_especially_ useful when you had conflicts, so that you know how to \nrecreate the merge?\n\nCiao,\nDscho\n"}]}