From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 May 2008 03:12:44 +0000 (-0700)
Subject: Merge branch 'maint-1.5.4' into maint
X-Git-Tag: v1.5.5.2~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=32a27b56662b1c7aa13f98c95f170ba5290c7559;p=git.git

Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
  doc: clarify definition of "update" for git-add -u
---

32a27b56662b1c7aa13f98c95f170ba5290c7559