![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 14 Apr 2010 01:21:29 +0000 (18:21 -0700) | ||
| commit | a6018bbdca918c4f0a35badcfd826077d07502ca | |
| tree | 14bf0bcbea0095e15cadf5d514296a2be1b2e793 | tree | snapshot |
| parent | 4553d58f374c6bfcae6b4be528bbf11c18a7efe5 | commit | diff |
| parent | f78683f3a85ca16ae16e1180703d3280b272f45d | commit | diff |
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
* 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
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |