Code

Merge branch 'master' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:58:21 +0000 (13:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:58:21 +0000 (13:58 -0800)
commitbd58c4692fbc8c1794fe52fa856638f56fcca3ef
tree1cc668decb43468bae6806fa3ab0080b08d10285
parent9b8c8309d10435618e85572028869e8388c96a91
parent5a7a0fae8f964b5ad179018d6a50f25ef7550f97
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>"
Documentation/git-pull.txt
Documentation/rev-list-options.txt
builtin/clean.c