diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:41 -0800 |
| commit | e7e80778e705ea3f9332c634781d6d0f8c6eab64 (patch) | |
| tree | aaada0f9cb2029976fb2a877e50462862cabf278 /notes-merge.h | |
| parent | Merge branch 'mm/send-email-fallback-to-local-mail-address' (diff) | |
| parent | add--interactive: ignore submodule changes except HEAD (diff) | |
| download | tgif-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 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions