Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint
commit6baa11dc2a5bb926e88ee9befe88ecf3318ed83c
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:29 +0000 (21 14:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Nov 2017 05:05:29 +0000 (21 14:05 +0900)
treead7a460b2836dc07870cdbbddec381c4c48840cf
parent5a1f5c3060427375de30d609d72ac032516be4c2
parentc6d8ccf3a25556e1cac99433721e3c05ba970d89
Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint

"git rebase -i" recently started misbehaving when a submodule that
is configured with 'submodule.<name>.ignore' is dirty; this has
been corrected.

* bw/rebase-i-ignored-submodule-fix:
  wt-status: actually ignore submodules when requested
wt-status.c