summaryrefslogtreecommitdiff
path: root/graph.c
Commit message (Expand)AuthorAgeFilesLines
* graph: fix lack of color in horizontal linesDerrick Stolee2020-01-081-4/+9
* graph: drop assert() for merge with two collapsing parentsDerrick Stolee2020-01-081-4/+0
* Merge branch 'hw/doc-in-header'Junio C Hamano2019-12-161-0/+1
|\
| * graph: move doc to graph.h and graph.cHeba Waly2019-11-181-0/+1
* | fix-typo: consecutive-word duplicationsryenus2019-12-161-1/+1
* | graph: fix coloring of octopus dashesJames Coglan2019-10-161-34/+37
* | graph: flatten edges that fuse with their right neighborJames Coglan2019-10-161-8/+26
* | graph: smooth appearance of collapsing edges on commit linesJames Coglan2019-10-161-4/+13
* | graph: rename `new_mapping` to `old_mapping`James Coglan2019-10-161-27/+27
* | graph: commit and post-merge lines for left-skewed mergesJames Coglan2019-10-161-5/+58
* | graph: tidy up display of left-skewed mergesJames Coglan2019-10-161-28/+97
* | graph: extract logic for moving to GRAPH_PRE_COMMIT stateJames Coglan2019-10-161-4/+8
* | graph: remove `mapping_idx` and `graph_update_width()`James Coglan2019-10-161-55/+10
* | graph: reduce duplication in `graph_insert_into_new_columns()`James Coglan2019-10-161-13/+7
* | graph: reuse `find_new_column_by_commit()`James Coglan2019-10-161-25/+23
* | graph: handle line padding in `graph_next_line()`James Coglan2019-10-161-29/+20
* | graph: automatically track display width of graph linesJames Coglan2019-10-161-95/+99
|/
* Merge branch 'np/log-graph-octopus-fix'Junio C Hamano2018-10-261-15/+43
|\
| * log: fix coloring of certain octopus merge shapesNoam Postavsky2018-10-121-15/+43
* | graph: use strbuf_addchars() to add spacesrs/cleanup-strbuf-usersRené Scharfe2017-10-021-7/+3
|/
* config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* Merge branch 'rs/swap'Junio C Hamano2017-02-151-9/+2
|\
| * graph: use SWAP macrors/swapRené Scharfe2017-01-301-5/+1
| * use SWAP macroRené Scharfe2017-01-301-4/+1
* | Merge branch 'nd/log-graph-configurable-colors'Junio C Hamano2017-02-021-3/+37
|\ \ | |/ |/|
| * log --graph: customize the graph lines with config log.graphColorsNguyễn Thái Ngọc Duy2017-01-231-3/+37
* | Merge branch 'jk/graph-padding-fix'Junio C Hamano2016-10-061-4/+12
|\ \
| * | graph: fix extra spaces in graph_padding_linejk/graph-padding-fixJeff King2016-09-291-4/+12
* | | graph: add support for --line-prefix on all graph-aware outputJacob Keller2016-08-311-34/+64
* | | diff.c: remove output_prefix_length fieldJunio C Hamano2016-08-311-2/+0
| |/ |/|
* | Merge branch 'js/log-to-diffopt-file'Junio C Hamano2016-07-191-13/+17
|\ \
| * | graph: respect the diffopt.file settingJohannes Schindelin2016-06-241-13/+17
| |/
* | pretty: pass graph width to pretty formatting for use in '%>|(N)'Josef Kufner2016-06-161-0/+7
|/
* convert trivial cases to ALLOC_ARRAYJeff King2016-02-221-6/+4
* Merge branch 'rs/graph-simplify'Junio C Hamano2014-09-291-13/+4
|\
| * graph: simplify graph_padding_line()rs/graph-simplifyRené Scharfe2014-09-221-13/+4
* | Merge branch 'rs/realloc-array'Junio C Hamano2014-09-261-10/+4
|\ \ | |/ |/|
| * use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-10/+4
* | strbuf: use strbuf_addchars() for adding a char multiple timesrs/export-strbuf-addcharsRené Scharfe2014-09-081-3/+2
|/
* graph: fix coloring around octopus mergeshn/log-graph-color-octopusHemmo Nieminen2013-10-181-2/+2
* Revert "graph.c: mark private file-scope symbols as static"John Keeping2013-03-031-30/+2
* graph: output padding for merge subsequent parentsJohn Keeping2013-02-071-0/+10
* Merge branch 'mk/maint-graph-infinity-loop' into maintJunio C Hamano2013-01-141-1/+1
|\
| * graph.c: infinite loop in git whatchanged --graph -mMichał Kiedrowicz2012-09-251-1/+1
* | graph.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-2/+30
|/
* Add output_prefix_length to diff_optionsLucian Poston2012-04-161-0/+3
* color: delay auto-color decision until point of useJeff King2011-08-191-1/+1
* diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-1/+1
* Share color list between graph and show-branchDan McGee2011-04-041-22/+1
* rev-list/log: factor out revision mark generationMichael J Gruber2011-03-091-15/+2
View Lorry Controller Status