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

diff --cc Documentation/config.txt
Simple merge

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