git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a972229 c6d8ccf)
Merge branch 'bw/rebase-i-ignored-submodule-fix'
authorJunio C Hamano <redacted>
Wed, 15 Nov 2017 03:14:30 +0000 (12:14 +0900)
committerJunio C Hamano <redacted>
Wed, 15 Nov 2017 03:14:30 +0000 (12:14 +0900)
commitb50d82b00a8fc9d24e41ae7dc30185555f8fb0a0
tree626a7714e775c440ea15e74583ff1f163ff20186tree | snapshot
parenta97222978ab3e0e86e87dccacf59269a9060de9ecommit | diff
parentc6d8ccf3a25556e1cac99433721e3c05ba970d89commit | diff
Merge branch 'bw/rebase-i-ignored-submodule-fix'

"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 diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT