summaryrefslogtreecommitdiff
path: root/mergetools/examdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-01-23 13:16:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-23 13:16:41 -0800
commite7e80778e705ea3f9332c634781d6d0f8c6eab64 (patch)
treeaaada0f9cb2029976fb2a877e50462862cabf278 /mergetools/examdiff
parentMerge branch 'mm/send-email-fallback-to-local-mail-address' (diff)
parentadd--interactive: ignore submodule changes except HEAD (diff)
downloadtgif-e7e80778e705ea3f9332c634781d6d0f8c6eab64.tar.xz
Merge branch 'nd/add-i-ignore-submodules'
"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/examdiff')
0 files changed, 0 insertions, 0 deletions