diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-04-14 01:21:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-14 01:21:29 (GMT) |
| commit | a6018bbdca918c4f0a35badcfd826077d07502ca (patch) | |
| tree | 14bf0bcbea0095e15cadf5d514296a2be1b2e793 /Documentation/config.txt | |
| parent | 4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (diff) | |
| parent | f78683f3a85ca16ae16e1180703d3280b272f45d (diff) | |
| download | git-a6018bbdca918c4f0a35badcfd826077d07502ca.zip git-a6018bbdca918c4f0a35badcfd826077d07502ca.tar.gz git-a6018bbdca918c4f0a35badcfd826077d07502ca.tar.bz2 | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 06b2f82..aa5411e 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 |