Merge branch 'master' of git://linux-nfs.org/~bfields/git
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2007 00:55:52 +0000 (17:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2007 00:55:52 +0000 (17:55 -0700)
* 'master' of git://linux-nfs.org/~bfields/git:
documentation: use the word "index" in the git-add manual page
user-manual: mention git-gui
user-manual: mention git stash
user-manual: update for new default --track behavior

Trivial merge