/
uis
/
git
/
x
/
uis
/
git
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
984c833
12434ef
)
Merge branch 'nd/add-i-ignore-submodules' into maint
author
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Feb 2018 23:18:13 +0000
(15:18 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 15 Feb 2018 23:18:13 +0000
(15:18 -0800)
"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
Trivial merge