Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 21 Nov 2017 05:05:29 +0000
(14:05 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 21 Nov 2017 05:05:29 +0000
(14:05 +0900)
"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
1
2
wt-status.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
5a1f5c3
c6d8ccf
)
diff --cc
wt-status.c
Simple merge