summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano-1/+3
2019-01-29Merge branch 'jk/save-getenv-result'Junio C Hamano-1/+4
2019-01-29Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano-78/+143
2019-01-29Merge branch 'kg/external-diff-save-env'Junio C Hamano-1/+1
2019-01-24diff: clear emitted_symbols flag after useJeff King-1/+3
2019-01-18Merge branch 'nd/style-opening-brace'Junio C Hamano-2/+4
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano-9/+16
2019-01-11builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King-1/+4
2019-01-11diff: ensure correct lifetime of external_diff_cmdKim Gybels-1/+1
2019-01-10diff --color-moved-ws: handle blank linesPhillip Wood-3/+31
2019-01-10diff --color-moved-ws: modify allow-indentation-changePhillip Wood-58/+74
2019-01-10diff --color-moved-ws: optimize allow-indentation-changePhillip Wood-8/+11
2019-01-10diff --color-moved=zebra: be stricter with color alternationPhillip Wood-8/+19
2019-01-10diff --color-moved-ws: fix false positivesPhillip Wood-6/+9
2019-01-10diff: allow --no-color-moved-wsPhillip Wood-1/+5
2019-01-10Use "whitespace" consistentlyPhillip Wood-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano-6/+6
2018-12-10style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy-2/+4
2018-11-21Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano-2/+2
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano-1/+1
2018-11-14diff: align move detection error handling with other optionsStefan Beller-9/+16
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-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy-6/+6
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