| commit | aec7b362ad07e1a2c58051c8db653dabffee8960 | |
| author | Lars Hjemli <hjemli@gmail.com> | |
| Sun, 23 Sep 2007 22:51:43 +0000 (24 00:51 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2007 00:14:03 +0000 (23 17:14 -0700) | ||
| tree | 2c1a5325238be00cbccc71c32e8ab50483a4a3d2 | treesnapshot (tar.gz zip) |
| parent | d38eb710d92864b0b1f7cd36f17e273e3d8c735c | commitdiff |
git-merge: add support for branch.<name>.mergeoptions
This enables per branch configuration of merge options. Currently, the most
useful options to specify per branch are --squash, --summary/--no-summary
and possibly --strategy, but all options are supported.
Note: Options containing whitespace will _not_ be handled correctly. Luckily,
the only option which can include whitespace is --message and it doesn't
make much sense to give that option a default value.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This enables per branch configuration of merge options. Currently, the most
useful options to specify per branch are --squash, --summary/--no-summary
and possibly --strategy, but all options are supported.
Note: Options containing whitespace will _not_ be handled correctly. Luckily,
the only option which can include whitespace is --message and it doesn't
make much sense to give that option a default value.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/config.txt | diffblobblamehistory | |
| Documentation/git-merge.txt | diffblobblamehistory | |
| git-merge.sh | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |