index eae49c4876caf6b2e6a8bd9770b3981fb8133edd..bca4212e565c95f79a76a14cc4444e72e472a22c 100644 (file)
above outputs debugging information. The default is level 2.
Can be overridden 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
---------------