]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4e4140 a1087c9)
Merge branch 'ds/graph-assert-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Jan 2020 20:44:12 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Jan 2020 20:44:13 +0000 (12:44 -0800)
commit1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2
tree9cc28c86c02c4c3012a0fc04884f727eafa917e7tree | snapshot
parenta4e4140ac909f0466af239fde2199a11d81bd751commit | diff
parenta1087c93677bc0304c98f14915b1843e470e4a55commit | diff
Merge branch 'ds/graph-assert-fix'

Since recent updates to the log graph rendering code, drawing
certain merges started triggering an assert on a condition that
would no longer hold true, which has been corrected.

* ds/graph-assert-fix:
  graph: fix lack of color in horizontal lines
  graph: drop assert() for merge with two collapsing parents
Unnamed repository; edit this file 'description' to name the repository.