diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 10:05:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 10:05:58 (GMT) |
| commit | e66273a6abb8e9cd0967d52113e29c8014a255f8 (patch) | |
| tree | 6f17cc631f26ba74a7a94156e03e3add7ec0711c /Documentation/git-merge.txt | |
| parent | 9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 (diff) | |
| parent | d66424c4ac661c69640765260235452499d80378 (diff) | |
| download | git-e66273a6abb8e9cd0967d52113e29c8014a255f8.zip git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.gz git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.bz2 | |
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.<name>.mergeoptions
git-merge: refactor option parsing
git-merge: fix faulty SQUASH_MSG
Add test-script for git-merge porcelain
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index eae49c4..bca4212 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 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 --------------- |