Gerrit Pape <pape@xxxxxxxxxxx> writes: > If a strategy module auto resolved the merge cleanly, record the used > strategy in the log message, e.g.: > > Merge branch 'maint' using strategy ours > > Signed-off-by: Gerrit Pape <pape@xxxxxxxxxxx> > --- > >> I personally find this useful especially for the 'ours' strategy. I really do not think we want to do this, especially when the user did not specify anything unusual like "ours". At least, exclude recursive and octopus out of it, please. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
