]> granicus.if.org Git - git/commit
Merge branch 'jc/log-graph-simplify' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:25 +0000 (13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:25 +0000 (13:34 +0900)
commitfa0dc261cc8790c4beba285429b6c72103e2496f
tree102835cf41cd805e8eea23114938ca85b8b59007
parent4a2735d2c658647394e678556255d946e270b6e6
parentbbb13e8188ee37dd3e2318752342622266659620
Merge branch 'jc/log-graph-simplify' into jch

The implementation of "git log --graph" got refactored and then its
output got simplified.

* jc/log-graph-simplify:
  graph: fix coloring of octopus dashes
  graph: flatten edges that fuse with their right neighbor
  graph: smooth appearance of collapsing edges on commit lines
  graph: rename `new_mapping` to `old_mapping`
  graph: commit and post-merge lines for left-skewed merges
  graph: tidy up display of left-skewed merges
  graph: example of graph output that can be simplified
  graph: extract logic for moving to GRAPH_PRE_COMMIT state
  graph: remove `mapping_idx` and `graph_update_width()`
  graph: reduce duplication in `graph_insert_into_new_columns()`
  graph: reuse `find_new_column_by_commit()`
  graph: handle line padding in `graph_next_line()`
  graph: automatically track display width of graph lines