diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:12:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-08 20:12:44 -0700 |
| commit | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (patch) | |
| tree | b7a5665ff852003e2a4a595c98734cdb5ab8bf0d | |
| parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 (diff) | |
| parent | 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 (diff) | |
| download | git-32a27b56662b1c7aa13f98c95f170ba5290c7559.tar.gz git-32a27b56662b1c7aa13f98c95f170ba5290c7559.tar.xz | |
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
| -rw-r--r-- | Documentation/config.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-add.txt | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 04c01c5fd..273b35806 100644 --- 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 35e67a06e..e2389e380 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 |