From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 21:57:58 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~149
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a7a0fae8f964b5ad179018d6a50f25ef7550f97;p=git.git

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>"
---

5a7a0fae8f964b5ad179018d6a50f25ef7550f97