Merge branch 'maint'

* maint:
clean: remove redundant variable baselen
Documentation/git-pull: clarify configuration
Document that rev-list --graph triggers parent rewriting.
clean: avoid quoting twice
document sigchain api
Keep together options controlling the behaviour of diffcore-rename.
t3402: test "rebase -s<strategy> -X<opt>"

diff --combined Documentation/diff-options.txt
index bfd0b571e23a6b6ee21d9616466acd82795eed6c,5495344e612dece0eb6cb6311864463c004f1181..f3e95389aa5914cc05145625a5dd48bafbf086ba
--- 1/Documentation/diff-options.txt
--- 2/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@@ -207,7 -207,6 +207,7 @@@ endif::git-format-patch[
        digits can be specified with `--abbrev=<n>`.
  
  -B[<n>][/<m>]::
 +--break-rewrites[=[<n>][/<m>]]::
        Break complete rewrite changes into pairs of delete and
        create. This serves two purposes:
  +
@@@ -230,7 -229,6 +230,7 @@@ eligible for being picked up as a possi
  another file.
  
  -M[<n>]::
 +--detect-renames[=<n>]::
  ifndef::git-log[]
        Detect renames.
  endif::git-log[]
@@@ -246,24 -244,9 +246,10 @@@ endif::git-log[
        hasn't changed.
  
  -C[<n>]::
 +--detect-copies[=<n>]::
        Detect copies as well as renames.  See also `--find-copies-harder`.
        If `n` is specified, it has the same meaning as for `-M<n>`.
  
- ifndef::git-format-patch[]
- --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
-       Select only files that are Added (`A`), Copied (`C`),
-       Deleted (`D`), Modified (`M`), Renamed (`R`), have their
-       type (i.e. regular file, symlink, submodule, ...) changed (`T`),
-       are Unmerged (`U`), are
-       Unknown (`X`), or have had their pairing Broken (`B`).
-       Any combination of the filter characters (including none) can be used.
-       When `*` (All-or-none) is added to the combination, all
-       paths are selected if there is any file that matches
-       other criteria in the comparison; if there is no file
-       that matches other criteria, nothing is selected.
- endif::git-format-patch[]
- 
  --find-copies-harder::
        For performance reasons, by default, `-C` option finds copies only
        if the original file of the copy was modified in the same
@@@ -281,18 -264,26 +267,30 @@@
        number.
  
  ifndef::git-format-patch[]
+ --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
+       Select only files that are Added (`A`), Copied (`C`),
+       Deleted (`D`), Modified (`M`), Renamed (`R`), have their
+       type (i.e. regular file, symlink, submodule, ...) changed (`T`),
+       are Unmerged (`U`), are
+       Unknown (`X`), or have had their pairing Broken (`B`).
+       Any combination of the filter characters (including none) can be used.
+       When `*` (All-or-none) is added to the combination, all
+       paths are selected if there is any file that matches
+       other criteria in the comparison; if there is no file
+       that matches other criteria, nothing is selected.
+ 
  -S<string>::
        Look for differences that introduce or remove an instance of
        <string>. Note that this is different than the string simply
        appearing in diff output; see the 'pickaxe' entry in
        linkgit:gitdiffcore[7] for more details.
  
 +-G<regex>::
 +      Look for differences whose added or removed line matches
 +      the given <regex>.
 +
  --pickaxe-all::
 -      When `-S` finds a change, show all the changes in that
 +      When `-S` or `-G` finds a change, show all the changes in that
        changeset, not just the files that contain the change
        in <string>.