summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 12:55:29 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-22 12:55:29 -0700
commitd031611b80058b4f2217d154bf060aff8f80038f (patch)
tree30b17343fd84968f8f46f779da427862db435ce2 /git-pull.txt
parent0862f09cc973996f93b1254f944295e06d42822e (diff)
downloadgit-htmldocs-d031611b80058b4f2217d154bf060aff8f80038f.tar.gz
Autogenerated HTML docs for v1.7.12-70-g851f7
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-pull.txt b/git-pull.txt
index defb544ed..67fa5ee19 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -101,6 +101,7 @@ include::merge-options.txt[]
:git-pull: 1
+-r::
--rebase::
Rebase the current branch on top of the upstream branch after
fetching. If there is a remote-tracking branch corresponding to