]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f8a1785) | patch
pull: pass --autostash to merge
authorDenton Liu <liu.denton@gmail.com>
Tue, 7 Apr 2020 14:28:09 +0000 (10:28 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Apr 2020 16:28:02 +0000 (09:28 -0700)
commitd9f15d37f1a545305988f6b2bb40de1fbf0049cf
tree9ba6f8add9d176addd453d87276c37dba0025f6ftree
parentf8a178580719a93040a49cf25624f1d56d0147f1commit | diff
pull: pass --autostash to merge

Before, `--autostash` only worked with `git pull --rebase`. However, in
the last patch, merge learned `--autostash` as well so there's no reason
why we should have this restriction anymore. Teach pull to pass
`--autostash` to merge, just like it did for rebase.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-pull.txt diff | blob | blame | history
Documentation/merge-options.txt diff | blob | blame | history
builtin/pull.c diff | blob | blame | history
t/t5520-pull.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.