summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2016-09-29use QSORTRené Scharfe
2016-09-26Merge branch 'js/regexec-buf'Junio C Hamano
2016-09-26Merge branch 'va/i18n-more'Junio C Hamano
2016-09-26Merge branch 'mh/diff-indent-heuristic'Junio C Hamano
2016-09-21regex: use regexec_buf()Johannes Schindelin
2016-09-21i18n: i18n: diff: mark die messages for translationJean-Noël AVILA
2016-09-19Merge branch 'bc/object-id'Junio C Hamano
2016-09-19blame: honor the diff heuristic options and configMichael Haggerty
2016-09-19diff: improve positioning of add/delete blocks in diffsMichael Haggerty
2016-09-15Merge branch 'sb/diff-cleanup'Junio C Hamano
2016-09-12Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano
2016-09-08diff: remove dead codeStefan Beller
2016-09-08diff: omit found pointer from emit_callbackStefan Beller
2016-09-08diff.c: use diff_options directlyStefan Beller
2016-09-07cache: convert struct cache_entry to use struct object_idbrian m. carlson
2016-09-01diff: teach diff to display submodule difference with an inline diffJacob Keller
2016-09-01submodule: convert show_submodule_summary to use struct object_id *Jacob Keller
2016-09-01diff: prepare for additional submodule formatsJacob Keller
2016-09-01graph: add support for --line-prefix on all graph-aware outputJacob Keller
2016-09-01diff.c: remove output_prefix_length fieldJunio C Hamano
2016-08-12Merge branch 'kw/patch-ids-optim'Junio C Hamano
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford
2016-07-22diff: do not reuse worktree files that need "clean" conversionJeff King
2016-07-19Merge branch 'bc/cocci'Junio C Hamano
2016-06-28diff: convert prep_temp_blob() to struct object_idbrian m. carlson
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson
2016-06-28diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin
2016-06-10Merge branch 'jk/diff-compact-heuristic'Junio C Hamano
2016-06-10diff: disable compaction heuristic for nowJunio C Hamano
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano
2016-02-25diff: activate diff.renames by defaultMatthieu Moy
2016-02-22diff_populate_gitlink: use a strbufJeff King
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King
2016-02-22diff: clarify textconv interfaceJeff King
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen
2015-10-29Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano
2015-10-22diff: remove unused #include "sigchain.h"Tobias Klauser
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King
2015-09-29Sync with v2.5.4Junio C Hamano
2015-09-28Sync with 2.4.10Junio C Hamano