summaryrefslogtreecommitdiffstats
path: root/git-pull.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-30 14:49:53 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-30 14:49:53 -0700
commit967cda7cb7d2494c0cff6ebf0ad40fde587fb892 (patch)
tree53a75ad7da700bc405f2c40931a58f9fd39c6086 /git-pull.txt
parent535c65caafa13821295c3b060a5acd98bd2557b7 (diff)
downloadgit-htmldocs-967cda7cb7d2494c0cff6ebf0ad40fde587fb892.tar.gz
Autogenerated HTML docs for v2.13.2-556-g5116f
Diffstat (limited to 'git-pull.txt')
-rw-r--r--git-pull.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt
index e414185f5..9db5e08f4 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -131,7 +131,7 @@ unless you have read linkgit:git-rebase[1] carefully.
--autostash::
--no-autostash::
Before starting rebase, stash local modifications away (see
- linkgit:git-stash[1]) if needed, and apply the stash when
+ 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]).
+