From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Nov 2017 05:05:29 +0000 (+0900)
Subject: Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint
X-Git-Tag: v2.15.1~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6baa11dc2a5bb926e88ee9befe88ecf3318ed83c;p=thirdparty%2Fgit.git

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
---

6baa11dc2a5bb926e88ee9befe88ecf3318ed83c