diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:13 -0800 |
| commit | 2409e1035c6c81416f97bc8997ff1bd8cfb94f98 (patch) | |
| tree | 81e28367e3172b415517223085d1bbab716927b5 /git-add--interactive.perl | |
| parent | 984c8337de2e2d610d36426226c08a14b43af23f (diff) | |
| parent | 12434efc1d4a83d768e8b60bfdb711780677a308 (diff) | |
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 'git-add--interactive.perl')
| -rwxr-xr-x | git-add--interactive.perl | 2 |
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); |