summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/config.txt3
-rw-r--r--Documentation/git-add.txt4
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a102729fa4..a6fc5a2cfd 100644
--- 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 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