summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2019-02-14diff: drop complete_rewrite parameter from run_external_diff()Jeff King
2019-02-14diff: drop unused emit data parameter from sane_truncate_line()Jeff King
2019-02-14diff: drop unused color reset parametersJeff King
2019-02-14diff: drop options parameter from diffcore_fix_diff_index()Jeff King
2019-02-05Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano
2019-01-29Merge branch 'jk/save-getenv-result'Junio C Hamano
2019-01-29Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano
2019-01-29Merge branch 'kg/external-diff-save-env'Junio C Hamano
2019-01-24diff: clear emitted_symbols flag after useJeff King
2019-01-18Merge branch 'nd/style-opening-brace'Junio C Hamano
2019-01-14Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano
2019-01-12builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King
2019-01-12diff: ensure correct lifetime of external_diff_cmdKim Gybels
2019-01-10diff --color-moved-ws: handle blank linesPhillip Wood
2019-01-10diff --color-moved-ws: modify allow-indentation-changePhillip Wood
2019-01-10diff --color-moved-ws: optimize allow-indentation-changePhillip Wood
2019-01-10diff --color-moved=zebra: be stricter with color alternationPhillip Wood
2019-01-10diff --color-moved-ws: fix false positivesPhillip Wood
2019-01-10diff: allow --no-color-moved-wsPhillip Wood
2019-01-10Use "whitespace" consistentlyPhillip Wood
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2018-12-10style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy
2018-11-21Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano
2018-11-14diff: align move detection error handling with other optionsStefan Beller
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano
2018-11-12Upcast size_t variables to uintmax_t when printingTorsten Bögershausen
2018-11-12notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-05diff: convert --check to use a hunk callbackJeff King
2018-11-05diff: use hunk callback for word-diffJeff King
2018-11-05diff: discard hunk headers for patch-ids earlierJeff King
2018-11-05diff: avoid generating unused hunk header linesJeff King
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King
2018-10-30Merge branch 'js/diff-notice-has-drive-prefix'Junio C Hamano
2018-10-26Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Junio C Hamano
2018-10-22diff: don't attempt to strip prefix from absolute Windows pathsJohannes Sixt
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-10-12diff.c: pass sign_index to emit_line_ws_markupStefan Beller
2018-10-05diff --color-moved: fix a memory leakPhillip Wood
2018-10-05diff --color-moved-ws: fix another memory leakPhillip Wood
2018-10-05diff --color-moved-ws: fix a memory leakPhillip Wood
2018-10-05diff --color-moved-ws: fix out of bounds string accessPhillip Wood
2018-10-05diff --color-moved-ws: fix double free crashPhillip Wood
2018-09-24Merge branch 'sb/diff-color-move-more'Junio C Hamano
2018-09-21ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy