Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-pull-docfix-for-409b8d82' into jc/maint-pull-docfix
author
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Jan 2014 18:47:09 +0000
(10:47 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Jan 2014 18:47:09 +0000
(10:47 -0800)
* jc/maint-pull-docfix-for-
409b8d82
:
Documentation: exclude irrelevant options from "git pull"
Documentation/git-pull.txt
patch
|
blob
|
history
raw
(from parent 1:
66fa1b2
)
diff --git
a/Documentation/git-pull.txt
b/Documentation/git-pull.txt
index 24ab07a3f8f80c56cbbd7feffc1b5bf65e137968..546f7b195ccbdf527824c1e7c288f423f012dabf 100644
(file)
--- a/
Documentation/git-pull.txt
+++ b/
Documentation/git-pull.txt
@@
-97,10
+97,10
@@
must be given before the options meant for 'git fetch'.
Options related to merging
~~~~~~~~~~~~~~~~~~~~~~~~~~
-include::merge-options.txt[]
-
:git-pull: 1
+include::merge-options.txt[]
+
-r::
--rebase::
Rebase the current branch on top of the upstream branch after