summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Junio C Hamano2018-10-261-7/+5
|\
| * diff.c: pass sign_index to emit_line_ws_markupStefan Beller2018-10-121-7/+5
* | Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2018-10-191-41/+54
|\ \
| * | diff --color-moved: fix a memory leakPhillip Wood2018-10-041-2/+2
| * | diff --color-moved-ws: fix another memory leakPhillip Wood2018-10-041-0/+2
| * | diff --color-moved-ws: fix a memory leakPhillip Wood2018-10-041-1/+4
| * | diff --color-moved-ws: fix out of bounds string accessPhillip Wood2018-10-041-1/+1
| * | diff --color-moved-ws: fix double free crashPhillip Wood2018-10-041-37/+45
| |/
* | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-113/+148
|\ \ | |/ |/|
| * ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| * userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-17/+23
| * sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-10/+10
| * ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-8/+9
| * diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-74/+102
* | Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-09-241-5/+6
|\ \
| * | diff: fix --color-moved-ws=allow-indentation-changePhillip Wood2018-09-111-5/+6
* | | Merge branch 'jk/cocci'Junio C Hamano2018-09-171-14/+9
|\ \ \
| * | | show_dirstat: simplify same-content checkJeff King2018-08-291-8/+3
| * | | convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-3/+3
| * | | convert "oidcmp() == 0" to oideq()Jeff King2018-08-291-3/+3
| | |/ | |/|
* | | Merge branch 'sb/range-diff-colors'Junio C Hamano2018-09-171-41/+65
|\ \ \ | |/ / |/| |
| * | diff.c: add --output-indicator-{new, old, context}Stefan Beller2018-08-201-3/+18
| * | diff.c: rewrite emit_line_0 more understandablyStefan Beller2018-08-141-33/+40
| * | diff.c: omit check for line prefix in emit_line_0Stefan Beller2018-08-141-4/+1
| * | diff: use emit_line_0 once per lineStefan Beller2018-08-141-8/+8
| * | diff.c: add set_sign to emit_line_0Stefan Beller2018-08-141-9/+15
| * | diff.c: reorder arguments for emit_line_ws_markupStefan Beller2018-08-141-6/+6
| * | diff.c: simplify caller of emit_line_0Stefan Beller2018-08-141-2/+1
* | | Merge branch 'js/range-diff'Junio C Hamano2018-08-201-16/+89
|\ \ \ | |/ /
| * | range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin2018-08-131-6/+22
| * | range-diff --dual-color: skip white-space warningsJohannes Schindelin2018-08-131-0/+1
| * | diff: add an internal option to dual-color diffs of diffsJohannes Schindelin2018-08-131-15/+68
| * | range-diff: suppress the diff headersJohannes Schindelin2018-08-131-1/+4
* | | Merge branch 'nd/no-the-index'Junio C Hamano2018-08-201-11/+1
|\ \ \
| * | | convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-08-131-1/+1
| * | | diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy2018-08-131-10/+0
| |/ /
* | | Merge branch 'nd/i18n'Junio C Hamano2018-08-151-2/+2
|\ \ \
| * | | Update messages in preparation for i18nNguyễn Thái Ngọc Duy2018-07-231-2/+2
* | | | Merge branch 'es/diff-color-moved-fix'Junio C Hamano2018-08-151-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"Eric Sunshine2018-07-251-1/+3
| * | | Merge branch 'nd/diff-flush-before-warning' into maintJunio C Hamano2018-03-221-0/+1
| |\ \ \
| * \ \ \ Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano2018-02-271-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-08-021-26/+236
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | diff.c: offer config option to control ws handling in move detectionStefan Beller2018-07-191-0/+9
| * | | | | diff.c: add white space mode to move detection that allows indent changesStefan Beller2018-07-191-2/+156
| * | | | | diff.c: factor advance_or_nullify out of mark_color_as_movedStefan Beller2018-07-171-12/+20
| * | | | | diff.c: decouple white space treatment from move detection algorithmStefan Beller2018-07-171-2/+37
| * | | | | diff.c: add a blocks mode for moved code detectionStefan Beller2018-07-171-2/+4
View Lorry Controller Status