diff options
| author | Liam Beguin <liambeguin@gmail.com> | 2017-06-17 22:30:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 05:16:36 (GMT) |
| commit | e01db917d8e5c66f9f90bf8c44995cf47200273a (patch) | |
| tree | a1733a90149933d7902f1906c4c67e02d3bd218c /Documentation/git-pull.txt | |
| parent | 97e2ff464302565877a00b8a9aa6a2d85bd1445e (diff) | |
| download | git-e01db917d8e5c66f9f90bf8c44995cf47200273a.zip git-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.gz git-e01db917d8e5c66f9f90bf8c44995cf47200273a.tar.bz2 | |
stash: update documentation to use 'stash entry'
Most of the time, a 'stash entry' is called a 'stash'. Lets try to make
this more consistent and use 'stash entry' instead.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
| -rw-r--r-- | Documentation/git-pull.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index e414185..9db5e08 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/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]). + |