From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 9 May 2008 03:50:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~78
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f8115b;p=git.git

Merge branch 'maint'

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

1f8115b113def8ee03701aa87b26c5e8b7c94434