summaryrefslogtreecommitdiff
path: root/builtin/commit.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-04-07 14:28:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-10 16:28:02 (GMT)
commitd9f15d37f1a545305988f6b2bb40de1fbf0049cf (patch)
tree9ba6f8add9d176addd453d87276c37dba0025f6f /builtin/commit.c
parentf8a178580719a93040a49cf25624f1d56d0147f1 (diff)
downloadgit-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.zip
git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.gz
git-d9f15d37f1a545305988f6b2bb40de1fbf0049cf.tar.bz2
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 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions