summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-09-23 22:51:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-24 00:14:03 (GMT)
commitaec7b362ad07e1a2c58051c8db653dabffee8960 (patch)
tree2c1a5325238be00cbccc71c32e8ab50483a4a3d2 /Documentation/git-merge.txt
parentd38eb710d92864b0b1f7cd36f17e273e3d8c735c (diff)
downloadgit-aec7b362ad07e1a2c58051c8db653dabffee8960.zip
git-aec7b362ad07e1a2c58051c8db653dabffee8960.tar.gz
git-aec7b362ad07e1a2c58051c8db653dabffee8960.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 144bc16..b1771a1 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -58,6 +58,10 @@ merge.verbosity::
above outputs debugging information. The default is level 2.
Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+branch.<name>.mergeoptions::
+ Sets default options for merging into branch <name>. The syntax and
+ supported options are equal to that of git-merge, but option values
+ containing whitespace characters are currently not supported.
HOW MERGE WORKS
---------------