diff options
authorJunio C Hamano <>2008-05-09 03:50:03 (GMT)
committerJunio C Hamano <>2008-05-09 03:50:03 (GMT)
commit1f8115b113def8ee03701aa87b26c5e8b7c94434 (patch)
parentca1c9913f8ac0ccaf976d44822076e1bba5bcd94 (diff)
parent32a27b56662b1c7aa13f98c95f170ba5290c7559 (diff)
Merge branch 'maint'
* maint: Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull" doc: clarify definition of "update" for git-add -u
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a102729..a6fc5a2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -426,7 +426,8 @@ branch.<name>.mergeoptions::
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 2eabbc8..e0e730b 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -71,7 +71,9 @@ OPTIONS
the specified filepatterns before exiting.
- 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