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 | |
| 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')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-merge.txt | 3 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 06b2f827b4..aa5411e455 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -914,7 +914,7 @@ format.signoff:: gc.aggressiveWindow:: The window size parameter used in the delta compression algorithm used by 'git gc --aggressive'. This defaults - to 10. + to 250. gc.auto:: When there are approximately more than this many loose 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>... 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. |