Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
doc: clarify definition of "update" for git-add -u

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 04c01c5fdca566b1760e8eed02687607017e89aa..273b3580692defede224001aa44d41603bfbf6ee 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -415,7 +415,8 @@ branch.<name>.mergeoptions::
 
 branch.<name>.rebase::
        When true, rebase the branch <name> 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).

diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 35e67a06e4248182c05c98b4b9b421bb3e02940a..e2389e380b3e0c86629f08d9c44f54fc09396553 100644 (file)
--- 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