Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] git-merge: record merge strategy in the log message on auto resolved merges

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:18

Gerrit Pape [off-list ref] 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 <redacted>
---
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help