| commit | d9f15d37f1a545305988f6b2bb40de1fbf0049cf | |
| author | Denton Liu <liu.denton@gmail.com> | |
| Tue, 7 Apr 2020 14:28:09 +0000 (7 10:28 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 10 Apr 2020 16:28:02 +0000 (10 09:28 -0700) | ||
| tree | 9ba6f8add9d176addd453d87276c37dba0025f6f | treesnapshot (tar.gz zip) |
| parent | f8a178580719a93040a49cf25624f1d56d0147f1 | commitdiff |
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>
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 | diffblobblamehistory | |
| Documentation/merge-options.txt | diffblobblamehistory | |
| builtin/pull.c | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |