From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 21:58:21 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: ko-next~147
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bd58c4692fbc8c1794fe52fa856638f56fcca3ef;p=git.git

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

bd58c4692fbc8c1794fe52fa856638f56fcca3ef