From: Lars Hjemli Date: Sat, 22 Sep 2007 00:33:01 GMT Subject: [PATCH 0/5] per branch options for git-merge incl. --no-ff Message-ID: <1190421186-21784-1-git-send-email-hjemli@gmail.com> This patch-series implements support for per branch configuration of git-merge, using entries (branch..mergeoptions) in .git/config. There is also a new option, --no-ff, which can be used to force git-merge to create merge commits even when the merge was a fast-forward. Finally, the new optiond --ff and --commit can be used to override setting specified in .git/config. Note: patch 1/5 is a resend of the testscript for git-merge, this time with correct mode bits. Shortlog: Add test-script for git-merge porcelain git-merge: refactor option parsing git-merge: add support for branch..mergeoptions git-merge: add support for --commit git-merge: add --ff and --no-ff options Diffstat: Documentation/config.txt | 6 + Documentation/git-merge.txt | 4 + Documentation/merge-options.txt | 13 ++ git-merge.sh | 56 +++++- t/t7600-merge.sh | 414 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 483 insertions(+), 10 deletions(-)