summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Libravatar Junio C Hamano1-1/+1
2018-11-13Merge branch 'jk/xdiff-interface'Libravatar Junio C Hamano1-25/+23
2018-11-12Upcast size_t variables to uintmax_t when printingLibravatar Torsten Bögershausen1-1/+1
2018-11-05diff: convert --check to use a hunk callbackLibravatar Jeff King1-8/+12
2018-11-05diff: use hunk callback for word-diffLibravatar Jeff King1-7/+5
2018-11-05diff: discard hunk headers for patch-ids earlierLibravatar Jeff King1-6/+2
2018-11-05diff: avoid generating unused hunk header linesLibravatar Jeff King1-2/+2
2018-11-02xdiff-interface: provide a separate consume callback for hunksLibravatar Jeff King1-10/+10
2018-10-30Merge branch 'js/diff-notice-has-drive-prefix'Libravatar Junio C Hamano1-2/+2
2018-10-26Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Libravatar Junio C Hamano1-7/+5
2018-10-22diff: don't attempt to strip prefix from absolute Windows pathsLibravatar Johannes Sixt1-2/+2
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Libravatar Junio C Hamano1-41/+54
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-113/+148
2018-10-12diff.c: pass sign_index to emit_line_ws_markupLibravatar Stefan Beller1-7/+5
2018-10-04diff --color-moved: fix a memory leakLibravatar Phillip Wood1-2/+2
2018-10-04diff --color-moved-ws: fix another memory leakLibravatar Phillip Wood1-0/+2
2018-10-04diff --color-moved-ws: fix a memory leakLibravatar Phillip Wood1-1/+4
2018-10-04diff --color-moved-ws: fix out of bounds string accessLibravatar Phillip Wood1-1/+1
2018-10-04diff --color-moved-ws: fix double free crashLibravatar Phillip Wood1-37/+45
2018-09-24Merge branch 'sb/diff-color-move-more'Libravatar Junio C Hamano1-5/+6
2018-09-21ws.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2018-09-21userdiff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-17/+23
2018-09-21sha1-file.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-10/+10
2018-09-21ll-merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21diff.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-09-21diff.c: remove the_index dependency in textconv() functionsLibravatar Nguyễn Thái Ngọc Duy1-8/+9
2018-09-21diff.c: reduce implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-74/+102
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano1-14/+9
2018-09-17Merge branch 'sb/range-diff-colors'Libravatar Junio C Hamano1-41/+65
2018-09-11diff: fix --color-moved-ws=allow-indentation-changeLibravatar Phillip Wood1-5/+6
2018-08-29show_dirstat: simplify same-content checkLibravatar Jeff King1-8/+3
2018-08-29convert "oidcmp() != 0" to "!oideq()"Libravatar Jeff King1-3/+3
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-3/+3
2018-08-20diff.c: add --output-indicator-{new, old, context}Libravatar Stefan Beller1-3/+18
2018-08-20Merge branch 'js/range-diff'Libravatar Junio C Hamano1-16/+89
2018-08-20Merge branch 'nd/no-the-index'Libravatar Junio C Hamano1-11/+1
2018-08-15Merge branch 'nd/i18n'Libravatar Junio C Hamano1-2/+2
2018-08-15Merge branch 'es/diff-color-moved-fix'Libravatar Junio C Hamano1-1/+3
2018-08-14diff.c: rewrite emit_line_0 more understandablyLibravatar Stefan Beller1-33/+40
2018-08-14diff.c: omit check for line prefix in emit_line_0Libravatar Stefan Beller1-4/+1
2018-08-14diff: use emit_line_0 once per lineLibravatar Stefan Beller1-8/+8
2018-08-14diff.c: add set_sign to emit_line_0Libravatar Stefan Beller1-9/+15
2018-08-14diff.c: reorder arguments for emit_line_ws_markupLibravatar Stefan Beller1-6/+6
2018-08-14diff.c: simplify caller of emit_line_0Libravatar Stefan Beller1-2/+1
2018-08-13convert.c: remove an implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-08-13diff.c: move read_index() code back to the callerLibravatar Nguyễn Thái Ngọc Duy1-10/+0
2018-08-13range-diff: use dim/bold cues to improve dual color modeLibravatar Johannes Schindelin1-6/+22
2018-08-13range-diff --dual-color: skip white-space warningsLibravatar Johannes Schindelin1-0/+1
2018-08-13diff: add an internal option to dual-color diffs of diffsLibravatar Johannes Schindelin1-15/+68
2018-08-13range-diff: suppress the diff headersLibravatar Johannes Schindelin1-1/+4