summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Libravatar Junio C Hamano1-1/+3
2019-01-29Merge branch 'jk/save-getenv-result'Libravatar Junio C Hamano1-1/+4
2019-01-29Merge branch 'pw/diff-color-moved-ws-fix'Libravatar Junio C Hamano1-78/+143
2019-01-29Merge branch 'kg/external-diff-save-env'Libravatar Junio C Hamano1-1/+1
2019-01-24diff: clear emitted_symbols flag after useLibravatar Jeff King1-1/+3
2019-01-18Merge branch 'nd/style-opening-brace'Libravatar Junio C Hamano1-2/+4
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Libravatar Junio C Hamano1-9/+16
2019-01-11builtin_diff(): read $GIT_DIFF_OPTS closer to useLibravatar Jeff King1-1/+4
2019-01-11diff: ensure correct lifetime of external_diff_cmdLibravatar Kim Gybels1-1/+1
2019-01-10diff --color-moved-ws: handle blank linesLibravatar Phillip Wood1-3/+31
2019-01-10diff --color-moved-ws: modify allow-indentation-changeLibravatar Phillip Wood1-58/+74
2019-01-10diff --color-moved-ws: optimize allow-indentation-changeLibravatar Phillip Wood1-8/+11
2019-01-10diff --color-moved=zebra: be stricter with color alternationLibravatar Phillip Wood1-8/+19
2019-01-10diff --color-moved-ws: fix false positivesLibravatar Phillip Wood1-6/+9
2019-01-10diff: allow --no-color-moved-wsLibravatar Phillip Wood1-1/+5
2019-01-10Use "whitespace" consistentlyLibravatar Phillip Wood1-1/+1
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-6/+6
2018-12-10style: the opening '{' of a function is in a separate lineLibravatar Nguyễn Thái Ngọc Duy1-2/+4
2018-11-21Merge branch 'js/diff-notice-has-drive-prefix' into maintLibravatar Junio C Hamano1-2/+2
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Libravatar Junio C Hamano1-1/+1
2018-11-14diff: align move detection error handling with other optionsLibravatar Stefan Beller1-9/+16
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-12notes-cache.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-6/+6
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