diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:13 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:13 -0800 |
commit | 2409e1035c6c81416f97bc8997ff1bd8cfb94f98 (patch) | |
tree | 81e28367e3172b415517223085d1bbab716927b5 /t/t7606-merge-custom.sh | |
parent | Merge branch 'tg/stash-with-pathspec-fix' into maint (diff) | |
parent | add--interactive: ignore submodule changes except HEAD (diff) | |
download | tgif-2409e1035c6c81416f97bc8997ff1bd8cfb94f98.tar.xz |
Merge branch 'nd/add-i-ignore-submodules' into maint
"git add -p" was taught to ignore local changes to submodules as
they do not interfere with the partial addition of regular changes
anyway.
* nd/add-i-ignore-submodules:
add--interactive: ignore submodule changes except HEAD
Diffstat (limited to 't/t7606-merge-custom.sh')
0 files changed, 0 insertions, 0 deletions