From: Junio C Hamano Date: Wed, 3 Oct 2007 10:05:58 +0000 (-0700) Subject: Merge branch 'lh/merge' X-Git-Tag: v1.5.4-rc0~388 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e66273a6abb8e9cd0967d52113e29c8014a255f8;p=git.git Merge branch 'lh/merge' * lh/merge: git-merge: add --ff and --no-ff options git-merge: add support for --commit and --no-squash git-merge: add support for branch..mergeoptions git-merge: refactor option parsing git-merge: fix faulty SQUASH_MSG Add test-script for git-merge porcelain --- e66273a6abb8e9cd0967d52113e29c8014a255f8 diff --cc Documentation/git-merge.txt index eae49c487,b1771a13c..bca4212e5 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@@ -56,8 -56,12 +56,12 @@@ merge.verbosity: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. + Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. + branch..mergeoptions:: + Sets default options for merging into branch . 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 ---------------