Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:12:44 +0000 (20:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:12:44 +0000 (20:12 -0700)
commit32a27b56662b1c7aa13f98c95f170ba5290c7559
treeb7a5665ff852003e2a4a595c98734cdb5ab8bf0d
parent6233a5210ef64ba31bbf0e867e03e9176e0aace9
parent15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371
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
Documentation/config.txt
Documentation/git-add.txt