projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16d9d71 11c21f2)
Merge branch 'dl/octopus-graph-bug'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:48:01 +0000 (13:48 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:48:01 +0000 (13:48 +0900)
commit5b900fb812f678183d2810427b8862eb7f0dc22b
treed5d98738de8e385869bae82143f47f4793200150tree | snapshot
parent16d9d7184bbf39e8c1c9c4756805278f530be30fcommit | diff
parent11c21f22ded635bec5e10c833697c55aab442776commit | diff
Merge branch 'dl/octopus-graph-bug'

"git log --graph" for an octopus merge is sometimes colored
incorrectly, which is demonstrated and documented but not yet
fixed.

* dl/octopus-graph-bug:
  t4214: demonstrate octopus graph coloring failure
  t4214: explicitly list tags in log
  t4214: generate expect in their own test cases
  t4214: use test_merge
  test-lib: let test_merge() perform octopus merges
t/test-lib-functions.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.