Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
author
Dustin Sallings
<dustin@spy.net>
Thu, 8 May 2008 18:28:07 +0000
(11:28 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 8 May 2008 19:15:30 +0000
(12:15 -0700)
Signed-off-by: Dustin Sallings <dustin@spy.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
afd899e
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index 531ec46e957f85af2dfad69461ba81990500289e..ffa06366f53a531786fb179a2ab4e811007dc53f 100644
(file)
--- a/
Documentation/config.txt
+++ b/
Documentation/config.txt
@@
-362,7
+362,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).