diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-09 07:12:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-09 07:12:44 +0400 |
| commit | 32a27b56662b1c7aa13f98c95f170ba5290c7559 (patch) | |
| tree | b7a5665ff852003e2a4a595c98734cdb5ab8bf0d /Documentation/config.txt | |
| parent | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 (diff) | |
| parent | 15ddb6fab24e7cf848f7a91c59f8d96b6a5cd371 (diff) | |
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
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 04c01c5fdc..273b358069 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). |