summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-23 13:16:41 -0800
committerJunio C Hamano <gitster@pobox.com>2018-01-23 13:16:41 -0800
commite7e80778e705ea3f9332c634781d6d0f8c6eab64 (patch)
treeaaada0f9cb2029976fb2a877e50462862cabf278 /git-add--interactive.perl
parent897de845e62ddccba5310057b64d568bc3d4e182 (diff)
parent12434efc1d4a83d768e8b60bfdb711780677a308 (diff)
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 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 28b325d754..964c3a7542 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -262,7 +262,7 @@ sub list_modified {
}
}
- for (run_cmd_pipe(qw(git diff-files --numstat --summary --raw --), @ARGV)) {
+ for (run_cmd_pipe(qw(git diff-files --ignore-submodules=dirty --numstat --summary --raw --), @ARGV)) {
if (($add, $del, $file) =
/^([-\d]+) ([-\d]+) (.*)/) {
$file = unquote_path($file);