From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Aug 2007 00:55:52 +0000 (-0700)
Subject: Merge branch 'master' of git://linux-nfs.org/~bfields/git
X-Git-Tag: v1.5.3-rc5~67
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a2c3db8d224554f7cf995ae8403a0f081432cbae;p=git.git

Merge branch 'master' of git://linux-nfs.org/~bfields/git

* '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
---

a2c3db8d224554f7cf995ae8403a0f081432cbae