This series of patches updates default commit message for git-merge command. First patch adds alternative commit message formatting where each merged object is printed on new line and adds configuration option to enable it. New format may look good for merges with a lot of objects, but for merge with just one object old format may still look better. To be able to use both formats, new format type 'autoselect' is added in patch 2, and configuration option for format selection is reworked. Patch 3 changes default message formatting to 'autoselect' introduced in patch 2, thus changing default behaviour of git. i.Dark_Templar (3): git-merge: add option to format default message using multiple lines Add merge commit message type autoselect logic Enable merge commit message type autoselect logic by default Documentation/config/fmt-merge-msg.txt | 13 +++ builtin/fmt-merge-msg.c | 127 ++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 2 deletions(-) -- 2.24.1
