summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* diff: drop options parameter from diffcore_fix_diff_index()Jeff King2019-02-141-1/+1
* Merge branch 'jk/diff-cc-stat-fixes'Junio C Hamano2019-02-051-1/+3
|\
| * diff: clear emitted_symbols flag after useJeff King2019-01-241-1/+3
* | Merge branch 'jk/save-getenv-result'Junio C Hamano2019-01-291-1/+4
|\ \
| * | builtin_diff(): read $GIT_DIFF_OPTS closer to useJeff King2019-01-111-1/+4
| * | Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano2018-11-211-2/+2
| |\ \
* | \ \ Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2019-01-291-78/+143
|\ \ \ \
| * | | | diff --color-moved-ws: handle blank linesPhillip Wood2019-01-101-3/+31
| * | | | diff --color-moved-ws: modify allow-indentation-changePhillip Wood2019-01-101-58/+74
| * | | | diff --color-moved-ws: optimize allow-indentation-changePhillip Wood2019-01-101-8/+11
| * | | | diff --color-moved=zebra: be stricter with color alternationPhillip Wood2019-01-101-8/+19
| * | | | diff --color-moved-ws: fix false positivesPhillip Wood2019-01-101-6/+9
| * | | | diff: allow --no-color-moved-wsPhillip Wood2019-01-101-1/+5
| * | | | Use "whitespace" consistentlyPhillip Wood2019-01-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'kg/external-diff-save-env'Junio C Hamano2019-01-291-1/+1
|\ \ \ \
| * | | | diff: ensure correct lifetime of external_diff_cmdKim Gybels2019-01-111-1/+1
| |/ / /
* | | | Merge branch 'nd/style-opening-brace'Junio C Hamano2019-01-181-2/+4
|\ \ \ \
| * | | | style: the opening '{' of a function is in a separate lineNguyễn Thái Ngọc Duy2018-12-101-2/+4
| |/ / /
* | | | Merge branch 'sb/diff-color-moved-config-option-fixup'Junio C Hamano2019-01-141-9/+16
|\ \ \ \
| * | | | diff: align move detection error handling with other optionsStefan Beller2018-11-141-9/+16
* | | | | Merge branch 'nd/the-index'Junio C Hamano2019-01-041-6/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | notes-cache.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-6/+6
| |/ / /
* | | | Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano2018-11-191-1/+1
|\ \ \ \
| * | | | Upcast size_t variables to uintmax_t when printingTorsten Bögershausen2018-11-121-1/+1
| |/ / /
* | | | Merge branch 'jk/xdiff-interface'Junio C Hamano2018-11-131-25/+23
|\ \ \ \ | |/ / / |/| | |
| * | | diff: convert --check to use a hunk callbackJeff King2018-11-051-8/+12
| * | | diff: use hunk callback for word-diffJeff King2018-11-051-7/+5
| * | | diff: discard hunk headers for patch-ids earlierJeff King2018-11-051-6/+2
| * | | diff: avoid generating unused hunk header linesJeff King2018-11-051-2/+2
| * | | xdiff-interface: provide a separate consume callback for hunksJeff King2018-11-021-10/+10
| |/ /
* | | Merge branch 'js/diff-notice-has-drive-prefix'Junio C Hamano2018-10-301-2/+2
|\ \ \ | | |/ | |/|
| * | diff: don't attempt to strip prefix from absolute Windows pathsJohannes Sixt2018-10-221-2/+2
* | | Merge branch 'sb/diff-emit-line-ws-markup-cleanup'Junio C Hamano2018-10-261-7/+5
|\ \ \
| * | | diff.c: pass sign_index to emit_line_ws_markupStefan Beller2018-10-121-7/+5
* | | | Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano2018-10-191-41/+54
|\ \ \ \
| * | | | diff --color-moved: fix a memory leakPhillip Wood2018-10-041-2/+2
| * | | | diff --color-moved-ws: fix another memory leakPhillip Wood2018-10-041-0/+2
| * | | | diff --color-moved-ws: fix a memory leakPhillip Wood2018-10-041-1/+4
| * | | | diff --color-moved-ws: fix out of bounds string accessPhillip Wood2018-10-041-1/+1
| * | | | diff --color-moved-ws: fix double free crashPhillip Wood2018-10-041-37/+45
| |/ / /
* | | | Merge branch 'nd/the-index'Junio C Hamano2018-10-191-113/+148
|\ \ \ \ | |/ / / |/| | |
| * | | ws.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-3/+3
| * | | userdiff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-17/+23
| * | | sha1-file.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-10/+10
| * | | ll-merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-1/+1
| * | | diff.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-2/+2
| * | | diff.c: remove the_index dependency in textconv() functionsNguyễn Thái Ngọc Duy2018-09-211-8/+9
| * | | diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-74/+102
| | |/ | |/|
* | | Merge branch 'sb/diff-color-move-more'Junio C Hamano2018-09-241-5/+6
|\ \ \
| * | | diff: fix --color-moved-ws=allow-indentation-changePhillip Wood2018-09-111-5/+6
View Lorry Controller Status