]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jj/stash-reset-only-toplevel'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2019 02:40:49 +0000 (11:40 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2019 02:40:49 +0000 (11:40 +0900)
"git stash save" lost local changes to submodules, which has been
corrected.

* jj/stash-reset-only-toplevel:
  stash: avoid recursive hard reset on submodules

1  2 
builtin/stash.c

diff --cc builtin/stash.c
Simple merge