Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:50:03 +0000 (20:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 May 2008 03:50:03 +0000 (20:50 -0700)
commit1f8115b113def8ee03701aa87b26c5e8b7c94434
tree3cfa19b2c6ce648c8f09b63c60e70828dd7cb208
parentca1c9913f8ac0ccaf976d44822076e1bba5bcd94
parent32a27b56662b1c7aa13f98c95f170ba5290c7559
Merge branch 'maint'

* maint:
  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