From afd899e1b7ef2b55a24834faad228b45ded6320a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 8 May 2008 13:25:06 -0400 Subject: [PATCH 1/2] doc: clarify definition of "update" for git-add -u The "-u" option is described only in terms of "updating" files, which in turn is described only as "similar to what git commit -a does". Let's be a little more specific about what updating entails. Suggested by Geoffrey Irving. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/git-add.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index c751a17d07..ab88f0a763 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 From 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 Mon Sep 17 00:00:00 2001 From: Dustin Sallings Date: Thu, 8 May 2008 11:28:07 -0700 Subject: [PATCH 2/2] Documentation/config.txt: Mention branch..rebase applies to "git pull" Signed-off-by: Dustin Sallings Signed-off-by: Junio C Hamano --- Documentation/config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 531ec46e95..ffa06366f5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -362,7 +362,8 @@ branch..mergeoptions:: branch..rebase:: When true, rebase the branch on top of the fetched branch, - instead of merging the default branch from the default remote. + instead of merging the default branch from the default remote when + "git pull" is run. *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] for details).