summaryrefslogtreecommitdiff
path: root/line-log.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-21 14:05:29 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-21 14:05:29 +0900
commit6baa11dc2a5bb926e88ee9befe88ecf3318ed83c (patch)
treead7a460b2836dc07870cdbbddec381c4c48840cf /line-log.h
parent5a1f5c3060427375de30d609d72ac032516be4c2 (diff)
parentc6d8ccf3a25556e1cac99433721e3c05ba970d89 (diff)
downloadgit-6baa11dc2a5bb926e88ee9befe88ecf3318ed83c.tar.gz
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
Diffstat (limited to 'line-log.h')
0 files changed, 0 insertions, 0 deletions