diff options
author | Denton Liu <liu.denton@gmail.com> | 2020-04-07 17:28:09 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-04-10 19:28:02 +0300 |
commit | d9f15d37f1a545305988f6b2bb40de1fbf0049cf (patch) | |
tree | 9ba6f8add9d176addd453d87276c37dba0025f6f /path.c | |
parent | f8a178580719a93040a49cf25624f1d56d0147f1 (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>
Diffstat (limited to 'path.c')
0 files changed, 0 insertions, 0 deletions