summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2015-03-13Merge branch 'mk/diff-shortstat-dirstat-fix' into maintLibravatar Junio C Hamano1-1/+1
2015-03-06Merge branch 'mk/diff-shortstat-dirstat-fix'Libravatar Junio C Hamano1-1/+1
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}Libravatar René Scharfe1-1/+0
2015-03-02diff --shortstat --dirstat: remove duplicate outputLibravatar Mårten Kongstad1-1/+1
2014-10-20Merge branch 'jn/parse-config-slot'Libravatar Junio C Hamano1-2/+1
2014-10-14color_parse: do not mention variable name in error messageLibravatar Jeff King1-2/+1
2014-09-11Merge branch 'nd/large-blobs'Libravatar Junio C Hamano1-14/+38
2014-08-20run-command: introduce CHILD_PROCESS_INITLibravatar René Scharfe1-2/+1
2014-08-18diff: shortcut for diff'ing two binary SHA-1 objectsLibravatar Nguyễn Thái Ngọc Duy1-0/+13
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryLibravatar Nguyễn Thái Ngọc Duy1-8/+18
2014-08-18diff.c: allow to pass more flags to diff_populate_filespecLibravatar Nguyễn Thái Ngọc Duy1-6/+7
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintLibravatar Junio C Hamano1-1/+1
2014-07-17strbuf: use strbuf_addstr() for adding C stringsLibravatar René Scharfe1-6/+6
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintLibravatar Junio C Hamano1-0/+3
2014-06-20stat_opt: check extra strlen callLibravatar Jeff King1-1/+2
2014-06-20use skip_prefix to avoid repeating stringsLibravatar Jeff King1-18/+9
2014-06-20use skip_prefix to avoid magic numbersLibravatar Jeff King1-31/+34
2014-06-18parse_diff_color_slot: drop ofs parameterLibravatar Jeff King1-10/+10
2014-06-16Merge branch 'bg/xcalloc-nmemb-then-size'Libravatar Junio C Hamano1-1/+1
2014-06-16Merge branch 'jk/diff-follow-must-take-one-pathspec'Libravatar Junio C Hamano1-0/+3
2014-06-03Merge branch 'jk/external-diff-use-argv-array'Libravatar Junio C Hamano1-31/+25
2014-06-03Merge branch 'ks/tree-diff-nway'Libravatar Junio C Hamano1-0/+2
2014-05-27diff.c: rearrange xcalloc argumentsLibravatar Brian Gesiak1-1/+1
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneLibravatar Jeff King1-0/+3
2014-04-28Merge branch 'jk/external-diff-use-argv-array' (early part)Libravatar Junio C Hamano1-16/+16
2014-04-21run_external_diff: refactor cmdline setup logicLibravatar Jeff King1-11/+15
2014-04-21run_external_diff: hoist common bits out of conditionalLibravatar Jeff King1-5/+3
2014-04-21run_external_diff: drop fflush(NULL)Libravatar Jeff King1-1/+0
2014-04-21run_external_diff: clean up error handlingLibravatar Jeff King1-6/+3
2014-04-21run_external_diff: use an argv_array for the environmentLibravatar Jeff King1-9/+5
2014-04-21run_external_diff: use an argv_array for the command lineLibravatar Jeff King1-16/+16
2014-04-17i18n: remove obsolete comments for translators in diffstat generationLibravatar Jiang Xin1-8/+0
2014-04-08Merge branch 'jl/nor-or-nand-and'Libravatar Junio C Hamano1-1/+1
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyLibravatar Kirill Smelkov1-0/+1
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellLibravatar Kirill Smelkov1-0/+1
2014-03-31comments: fix misuses of "nor"Libravatar Justin Lebar1-1/+1
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintLibravatar Junio C Hamano1-2/+3
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintLibravatar Junio C Hamano1-24/+43