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/merge-options.txt | |
| parent | 4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (diff) | |
| parent | f78683f3a85ca16ae16e1180703d3280b272f45d (diff) | |
| download | git-a6018bbdca918c4f0a35badcfd826077d07502ca.tar.gz | |
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/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 37ce9a17fc..722d704ff2 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -62,6 +62,11 @@ option can be used to override --squash. is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise). +-X <option>:: +--strategy-option=<option>:: + Pass merge strategy specific option through to the merge + strategy. + --summary:: --no-summary:: Synonyms to --stat and --no-stat; these are deprecated and will be @@ -76,8 +81,3 @@ ifndef::git-pull[] --verbose:: Be verbose. endif::git-pull[] - --X <option>:: ---strategy-option=<option>:: - Pass merge strategy specific option through to the merge - strategy. |