diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-04-07 16:28:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 18:28:02 +0200 |
| commit | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (patch) | |
| tree | 9ba6f8add9d176addd453d87276c37dba0025f6f /sequencer.c | |
| parent | t5520: make test_pull_autostash() accept expect_parent_num (diff) | |
| download | git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.xz git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.zip | |
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>
Diffstat (limited to 'sequencer.c')
0 files changed, 0 insertions, 0 deletions