summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 17:03:20 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 17:03:20 -0700
commit67cc2b7cdda7af3a7079b399a8a154d094efc649 (patch)
tree9c4830195de2ffd5ecdfca15e0e04be9bf959a4e /git-pull.txt
parent0dd50943c112dfc70367bd39eb3c88371db2518f (diff)
downloadgit-htmldocs-67cc2b7cdda7af3a7079b399a8a154d094efc649.tar.gz
Autogenerated HTML docs for v2.26.2-447-gd61d2
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt9
1 files changed, 0 insertions, 9 deletions
diff --git a/git-pull.txt b/git-pull.txt
index 9c7ab2d48..5c3fb67c0 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -134,15 +134,6 @@ unless you have read linkgit:git-rebase[1] carefully.
--no-rebase::
Override earlier --rebase.
---autostash::
---no-autostash::
- Before starting rebase, stash local modifications away (see
- linkgit:git-stash[1]) if needed, and apply the stash entry when
- done. `--no-autostash` is useful to override the `rebase.autoStash`
- configuration variable (see linkgit:git-config[1]).
-+
-This option is only valid when "--rebase" is used.
-
Options related to fetching
~~~~~~~~~~~~~~~~~~~~~~~~~~~