summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano-1/+1
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano-25/+23
2018-11-12Upcast size_t variables to uintmax_t when printingTorsten Bögershausen-1/+1
2018-11-05diff: convert --check to use a hunk callbackJeff King-8/+12
2018-11-05diff: use hunk callback for word-diffJeff King-7/+5
2018-11-05diff: discard hunk headers for patch-ids earlierJeff King-6/+2
2018-11-05diff: avoid generating unused hunk header linesJeff King-2/+2
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King-10/+10
2018-10-30Merge branch 'js/diff-notice-has-drive-prefix'Junio C Hamano-2/+2
2018-10-26Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Junio C Hamano-7/+5
2018-10-22diff: don't attempt to strip prefix from absolute Windows pathsJohannes Sixt-2/+2
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano-41/+54
2018-10-19Merge branch 'nd/the-index'Junio C Hamano-113/+148
2018-10-12diff.c: pass sign_index to emit_line_ws_markupStefan Beller-7/+5
2018-10-04diff --color-moved: fix a memory leakPhillip Wood-2/+2
2018-10-04diff --color-moved-ws: fix another memory leakPhillip Wood-0/+2
2018-10-04diff --color-moved-ws: fix a memory leakPhillip Wood-1/+4
2018-10-04diff --color-moved-ws: fix out of bounds string accessPhillip Wood-1/+1
2018-10-04diff --color-moved-ws: fix double free crashPhillip Wood-37/+45
2018-09-24Merge branch 'sb/diff-color-move-more'Junio C Hamano-5/+6
2018-09-21ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-3/+3
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-17/+23
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-10/+10
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy-2/+2
2018-09-21diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy-8/+9
2018-09-21diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy-74/+102
2018-09-17Merge branch 'jk/cocci'Junio C Hamano-14/+9
2018-09-17Merge branch 'sb/range-diff-colors'Junio C Hamano-41/+65
2018-09-11diff: fix --color-moved-ws=allow-indentation-changePhillip Wood-5/+6
2018-08-29show_dirstat: simplify same-content checkJeff King-8/+3
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King-3/+3
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King-3/+3
2018-08-20diff.c: add --output-indicator-{new, old, context}Stefan Beller-3/+18
2018-08-20Merge branch 'js/range-diff'Junio C Hamano-16/+89
2018-08-20Merge branch 'nd/no-the-index'Junio C Hamano-11/+1
2018-08-15Merge branch 'nd/i18n'Junio C Hamano-2/+2
2018-08-15Merge branch 'es/diff-color-moved-fix'Junio C Hamano-1/+3
2018-08-14diff.c: rewrite emit_line_0 more understandablyStefan Beller-33/+40
2018-08-14diff.c: omit check for line prefix in emit_line_0Stefan Beller-4/+1
2018-08-14diff: use emit_line_0 once per lineStefan Beller-8/+8
2018-08-14diff.c: add set_sign to emit_line_0Stefan Beller-9/+15
2018-08-14diff.c: reorder arguments for emit_line_ws_markupStefan Beller-6/+6
2018-08-14diff.c: simplify caller of emit_line_0Stefan Beller-2/+1
2018-08-13convert.c: remove an implicit dependency on the_indexNguyễn Thái Ngọc Duy-1/+1
2018-08-13diff.c: move read_index() code back to the callerNguyễn Thái Ngọc Duy-10/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeJohannes Schindelin-6/+22
2018-08-13range-diff --dual-color: skip white-space warningsJohannes Schindelin-0/+1
2018-08-13diff: add an internal option to dual-color diffs of diffsJohannes Schindelin-15/+68
2018-08-13range-diff: suppress the diff headersJohannes Schindelin-1/+4