This patch-series implements support for per branch configuration of git-merge, using entries (branch.<name>.mergeoptions) in .git/config. Since this makes it possible to specify --no-commit and --squash as default options for git-merge, the new options --commit and --no-squash are added to enable users to override such defaults. There is also a new option, --no-ff, which can be used to force git-merge to create a merge commit even when the merge was a fast-forward (and a matching --ff option to allow overrides). Shortlog: Add test-script for git-merge porcelain git-merge: fix faulty SQUASH_MSG git-merge: refactor option parsing git-merge: add support for branch.<name>.mergeoptions git-merge: add support for --commit and --no-squash git-merge: add --ff and --no-ff options Diffstat: Documentation/config.txt | 6 + Documentation/git-merge.txt | 4 + Documentation/merge-options.txt | 17 ++ git-merge.sh | 65 +++++- t/t7600-merge.sh | 440 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 521 insertions(+), 11 deletions(-) - 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
