diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-13 18:21:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-13 18:21:29 -0700 |
| commit | a6018bbdca918c4f0a35badcfd826077d07502ca (patch) | |
| tree | 14bf0bcbea0095e15cadf5d514296a2be1b2e793 /Documentation/git-merge.txt | |
| parent | Merge branch 'jl/maint-submodule-gitfile-awareness' (diff) | |
| parent | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 (diff) | |
| download | tgif-a6018bbdca918c4f0a35badcfd826077d07502ca.tar.xz | |
Merge branch 'maint'
* maint:
Documentation/config.txt: default gc.aggressiveWindow is 250, not 10
Docs: Add -X option to git-merge's synopsis.
Conflicts:
Documentation/merge-options.txt
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 9c9618cead..c2325ef90e 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -9,7 +9,8 @@ git-merge - Join two or more development histories together SYNOPSIS -------- [verse] -'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]... +'git merge' [-n] [--stat] [--no-commit] [--squash] + [-s <strategy>] [-X <strategy-option>] [--[no-]rerere-autoupdate] [-m <msg>] <commit>... 'git merge' <msg> HEAD <commit>... |