summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-02-15 15:18:13 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-15 15:18:13 -0800
commit2409e1035c6c81416f97bc8997ff1bd8cfb94f98 (patch)
tree81e28367e3172b415517223085d1bbab716927b5 /mergetools
parentMerge branch 'tg/stash-with-pathspec-fix' into maint (diff)
parentadd--interactive: ignore submodule changes except HEAD (diff)
downloadtgif-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 'mergetools')
0 files changed, 0 insertions, 0 deletions