Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (13:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:57:58 +0000 (13:57 -0800)
* 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>"

1  2 
Documentation/diff-options.txt
Simple merge