summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2016-09-19blame: honor the diff heuristic options and configLibravatar Michael Haggerty1-12/+17
2016-09-19diff: improve positioning of add/delete blocks in diffsLibravatar Michael Haggerty1-3/+20
2016-09-15Merge branch 'sb/diff-cleanup'Libravatar Junio C Hamano1-21/+10
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Libravatar Junio C Hamano1-17/+37
2016-09-08diff: remove dead codeLibravatar Stefan Beller1-8/+0
2016-09-08diff: omit found pointer from emit_callbackLibravatar Stefan Beller1-4/+2
2016-09-08diff.c: use diff_options directlyLibravatar Stefan Beller1-11/+10
2016-09-07cache: convert struct cache_entry to use struct object_idLibravatar brian m. carlson1-1/+1
2016-08-31diff: teach diff to display submodule difference with an inline diffLibravatar Jacob Keller1-9/+22
2016-08-31submodule: convert show_submodule_summary to use struct object_id *Libravatar Jacob Keller1-1/+1
2016-08-31diff: prepare for additional submodule formatsLibravatar Jacob Keller1-6/+6
2016-08-31graph: add support for --line-prefix on all graph-aware outputLibravatar Jacob Keller1-0/+7
2016-08-31diff.c: remove output_prefix_length fieldLibravatar Junio C Hamano1-1/+1
2016-08-12Merge branch 'kw/patch-ids-optim'Libravatar Junio C Hamano1-6/+10
2016-08-10Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning' into maintLibravatar Junio C Hamano1-0/+7
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Libravatar Junio C Hamano1-0/+7
2016-07-29patch-ids: add flag to create the diff patch id using header only dataLibravatar Kevin Willford1-6/+10
2016-07-22diff: do not reuse worktree files that need "clean" conversionLibravatar Jeff King1-0/+7
2016-07-19Merge branch 'bc/cocci'Libravatar Junio C Hamano1-46/+53
2016-06-28diff: convert prep_temp_blob() to struct object_idLibravatar brian m. carlson1-4/+4
2016-06-28diff: rename struct diff_filespec's sha1_valid memberLibravatar brian m. carlson1-14/+14
2016-06-28diff: convert struct diff_filespec to struct object_idLibravatar brian m. carlson1-31/+38
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()Libravatar brian m. carlson1-1/+1
2016-06-28diff: do not color output when --color=auto and --output=<file> is givenLibravatar Johannes Schindelin1-0/+2
2016-06-10Merge branch 'jk/diff-compact-heuristic'Libravatar Junio C Hamano1-1/+1
2016-06-10diff: disable compaction heuristic for nowLibravatar Junio C Hamano1-1/+1
2016-05-06Merge branch 'jk/diff-compact-heuristic'Libravatar Junio C Hamano1-0/+11
2016-04-19xdiff: implement empty line chunk heuristicLibravatar Stefan Beller1-0/+11
2016-04-03Merge branch 'mm/diff-renames-default'Libravatar Junio C Hamano1-0/+5
2016-02-26Merge branch 'jk/tighten-alloc'Libravatar Junio C Hamano1-13/+10
2016-02-26Merge branch 'jk/more-comments-on-textconv'Libravatar Junio C Hamano1-1/+4
2016-02-25diff: activate diff.renames by defaultLibravatar Matthieu Moy1-0/+5
2016-02-22diff_populate_gitlink: use a strbufLibravatar Jeff King1-8/+8
2016-02-22convert trivial cases to FLEX_ARRAY macrosLibravatar Jeff King1-5/+2
2016-02-22diff: clarify textconv interfaceLibravatar Jeff King1-1/+4
2016-02-05Merge branch 'nd/diff-with-path-params' into maintLibravatar Junio C Hamano1-4/+10
2016-02-03Merge branch 'nd/diff-with-path-params'Libravatar Junio C Hamano1-4/+10
2016-01-21diff: make -O and --output work in subdirectoryLibravatar Duy Nguyen1-4/+10
2015-10-29Merge branch 'tk/sigchain-unnecessary-post-tempfile'Libravatar Junio C Hamano1-1/+0
2015-10-22diff: remove unused #include "sigchain.h"Libravatar Tobias Klauser1-1/+0
2015-10-20Merge branch 'jk/war-on-sprintf'Libravatar Junio C Hamano1-11/+10
2015-10-05use sha1_to_hex_r() instead of strcpyLibravatar Jeff King1-5/+4
2015-09-28Sync with v2.5.4Libravatar Junio C Hamano1-10/+16
2015-09-28Sync with 2.4.10Libravatar Junio C Hamano1-10/+16
2015-09-28Sync with 2.3.10Libravatar Junio C Hamano1-10/+16
2015-09-28react to errors in xdi_diffLibravatar Jeff King1-10/+16
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfLibravatar Jeff King1-6/+6
2015-08-31Merge branch 'hv/submodule-config'Libravatar Junio C Hamano1-0/+1
2015-08-25Merge branch 'mh/tempfile'Libravatar Junio C Hamano1-23/+23
2015-08-19submodule: use new config API for worktree configurationsLibravatar Heiko Voigt1-0/+1