From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Apr 2010 01:21:29 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.1-rc2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a6018bbdca918c4f0a35badcfd826077d07502ca

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
---

a6018bbdca918c4f0a35badcfd826077d07502ca
diff --cc Documentation/merge-options.txt
index 37ce9a17fc,81ac823964..722d704ff2
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -75,9 -79,3 +80,4 @@@ ifndef::git-pull[
  -v::
  --verbose::
  	Be verbose.
 +endif::git-pull[]
- 
- -X <option>::
- --strategy-option=<option>::
- 	Pass merge strategy specific option through to the merge
- 	strategy.