Merge branch 'maint'

* maint:
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 a102729fa4a76ce789693362138b2f11b2907977..a6fc5a2cfd96bc4d26f42637721f5f9eb2f73e7e 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -426,7 +426,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 2eabbc8f7cf56040bb57c5f5ee3570c63fedc166..e0e730b6c44d473ad6cc9a23f7b727ab818d63a5 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