summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2016-08-12Merge branch 'kw/patch-ids-optim'Junio C Hamano-6/+10
2016-08-03Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'Junio C Hamano-0/+7
2016-07-29patch-ids: add flag to create the diff patch id using header only dataKevin Willford-6/+10
2016-07-22diff: do not reuse worktree files that need "clean" conversionJeff King-0/+7
2016-07-19Merge branch 'bc/cocci'Junio C Hamano-46/+53
2016-06-28diff: convert prep_temp_blob() to struct object_idbrian m. carlson-4/+4
2016-06-28diff: rename struct diff_filespec's sha1_valid memberbrian m. carlson-14/+14
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson-31/+38
2016-06-28coccinelle: convert hashcpy() with null_sha1 to hashclr()brian m. carlson-1/+1
2016-06-28diff: do not color output when --color=auto and --output=<file> is givenJohannes Schindelin-0/+2
2016-06-10Merge branch 'jk/diff-compact-heuristic'Junio C Hamano-1/+1
2016-06-10diff: disable compaction heuristic for nowJunio C Hamano-1/+1
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano-0/+11
2016-04-19xdiff: implement empty line chunk heuristicStefan Beller-0/+11
2016-04-03Merge branch 'mm/diff-renames-default'Junio C Hamano-0/+5
2016-02-26Merge branch 'jk/tighten-alloc'Junio C Hamano-13/+10
2016-02-26Merge branch 'jk/more-comments-on-textconv'Junio C Hamano-1/+4
2016-02-25diff: activate diff.renames by defaultMatthieu Moy-0/+5
2016-02-22diff_populate_gitlink: use a strbufJeff King-8/+8
2016-02-22convert trivial cases to FLEX_ARRAY macrosJeff King-5/+2
2016-02-22diff: clarify textconv interfaceJeff King-1/+4
2016-02-05Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano-4/+10
2016-02-03Merge branch 'nd/diff-with-path-params'Junio C Hamano-4/+10
2016-01-21diff: make -O and --output work in subdirectoryDuy Nguyen-4/+10
2015-10-29Merge branch 'tk/sigchain-unnecessary-post-tempfile'Junio C Hamano-1/+0
2015-10-22diff: remove unused #include "sigchain.h"Tobias Klauser-1/+0
2015-10-20Merge branch 'jk/war-on-sprintf'Junio C Hamano-11/+10
2015-10-05use sha1_to_hex_r() instead of strcpyJeff King-5/+4
2015-09-28Sync with v2.5.4Junio C Hamano-10/+16
2015-09-28Sync with 2.4.10Junio C Hamano-10/+16
2015-09-28Sync with 2.3.10Junio C Hamano-10/+16
2015-09-28react to errors in xdi_diffJeff King-10/+16
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King-6/+6
2015-08-31Merge branch 'hv/submodule-config'Junio C Hamano-0/+1
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano-23/+23
2015-08-19submodule: use new config API for worktree configurationsHeiko Voigt-0/+1
2015-08-12diff: use tempfile moduleMichael Haggerty-23/+23
2015-08-03Merge branch 'dt/log-follow-config'Junio C Hamano-2/+3
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano-1/+6
2015-07-12diff: parse ws-error-highlight option more strictlyRené Scharfe-1/+6
2015-07-09log: add "log.follow" configuration variableDavid Turner-2/+3
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano-14/+14
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano-15/+15
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano-22/+100
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King-13/+13
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano-16/+68
2015-05-26diff.c: add emit_del_line() and emit_context_line()Junio C Hamano-12/+38
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintJunio C Hamano-1/+0
2015-03-17Merge branch 'rs/deflate-init-cleanup'Junio C Hamano-1/+0
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-01 07:50:10 +0000