Merge branch 'master' into next

* master:
  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 --cc Documentation/git-pull.txt
Simple merge

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc builtin/clean.c
Simple merge