diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:50:03 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:50:03 -0700 |
commit | 1f8115b113def8ee03701aa87b26c5e8b7c94434 (patch) | |
tree | 3cfa19b2c6ce648c8f09b63c60e70828dd7cb208 /Documentation/git-add.txt | |
parent | Merge branch 'sg/merge-options' (early part) (diff) | |
parent | Merge branch 'maint-1.5.4' into maint (diff) | |
download | tgif-1f8115b113def8ee03701aa87b26c5e8b7c94434.tar.xz |
Merge branch 'maint'
* maint:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u
Diffstat (limited to 'Documentation/git-add.txt')
-rw-r--r-- | Documentation/git-add.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index 2eabbc8f7c..e0e730b6c4 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -71,7 +71,9 @@ OPTIONS the specified filepatterns before exiting. -u:: - Update only files that git already knows about. This is similar + Update only files that git already knows about, staging modified + content for commit and marking deleted files for removal. This + is similar to what "git commit -a" does in preparation for making a commit, except that the update is limited to paths specified on the command line. If no paths are specified, all tracked files in the |