summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2016-08-12Merge branch 'kw/patch-ids-optim'Libravatar Junio C Hamano1-6/+10
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
2015-08-12diff: use tempfile moduleLibravatar Michael Haggerty1-23/+23
2015-08-03Merge branch 'dt/log-follow-config'Libravatar Junio C Hamano1-2/+3
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano1-1/+6
2015-07-12diff: parse ws-error-highlight option more strictlyLibravatar René Scharfe1-1/+6
2015-07-09log: add "log.follow" configuration variableLibravatar David Turner1-2/+3
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintLibravatar Junio C Hamano1-14/+14
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Libravatar Junio C Hamano1-15/+15
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Libravatar Junio C Hamano1-22/+100
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTLibravatar Jeff King1-13/+13
2015-05-27diff: accept color.diff.context as a synonym for "plain"Libravatar Jeff King1-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionLibravatar Junio C Hamano1-16/+68
2015-05-26diff.c: add emit_del_line() and emit_context_line()Libravatar Junio C Hamano1-12/+38
2015-03-23Merge branch 'rs/deflate-init-cleanup' into maintLibravatar Junio C Hamano1-1/+0
2015-03-17Merge branch 'rs/deflate-init-cleanup'Libravatar Junio C Hamano1-1/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 19:23:06 +0000