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 /.gitignore | |
| parent | 4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (diff) | |
| parent | f78683f3a85ca16ae16e1180703d3280b272f45d (diff) | |
| download | git-a6018bbdca918c4f0a35badcfd826077d07502ca.tar.gz git-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 '.gitignore')
0 files changed, 0 insertions, 0 deletions