Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ja/maint-pull-rebase-doc'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000
(21:49 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Dec 2010 05:49:53 +0000
(21:49 -0800)
* ja/maint-pull-rebase-doc:
git-pull.txt: Mention branch.autosetuprebase
Documentation/git-pull.txt
patch
|
blob
|
history
raw
(from parent 1:
52cb573
)
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 4db73737b044dc151baed09a3f3d17e428eb124b..30466917dad52eefd76de95aead3fdc12ad8425d 100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-98,8
+98,9
@@
include::merge-options.txt[]
fetched, the rebase uses that information to avoid rebasing
non-local changes.
+
-See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
-`git pull` always use `{litdd}rebase` instead of merging.
+See `branch.<name>.rebase` and `branch.autosetuprebase` in
+linkgit:git-config[1] if you want to make `git pull` always use
+`{litdd}rebase` instead of merging.
+
[NOTE]
This is a potentially _dangerous_ mode of operation.