Merge branch 'maint'
commit5a7a0fae8f964b5ad179018d6a50f25ef7550f97
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (17 13:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (17 13:57 -0800)
tree126f1390f83cbddc7b67b70f25348b282944a772
parentd6b634fafdb5570d9c25d5176d3d32fe0b22530d
parent1c7d402b3e1e9d7e50abfbfb18c88bc79be468ea
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>"
Documentation/diff-options.txt