summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2015-06-25Merge branch 'jk/color-diff-plain-is-context' into maintJunio C Hamano
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King
2015-03-17Merge branch 'rs/deflate-init-cleanup'Junio C Hamano
2015-03-06Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe
2015-03-02diff --shortstat --dirstat: remove duplicate outputMårten Kongstad
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano
2014-10-14color_parse: do not mention variable name in error messageJeff King
2014-09-11Merge branch 'nd/large-blobs'Junio C Hamano
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe
2014-08-18diff: shortcut for diff'ing two binary SHA-1 objectsNguyễn Thái Ngọc Duy
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy
2014-08-18diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano
2014-07-17strbuf: use strbuf_addstr() for adding C stringsRené Scharfe
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano
2014-06-20stat_opt: check extra strlen callJeff King
2014-06-20use skip_prefix to avoid repeating stringsJeff King
2014-06-20use skip_prefix to avoid magic numbersJeff King
2014-06-18parse_diff_color_slot: drop ofs parameterJeff King
2014-06-16Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano
2014-06-16Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano
2014-06-03Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano
2014-05-27diff.c: rearrange xcalloc argumentsBrian Gesiak
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneJeff King
2014-04-28Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano
2014-04-21run_external_diff: refactor cmdline setup logicJeff King
2014-04-21run_external_diff: hoist common bits out of conditionalJeff King
2014-04-21run_external_diff: drop fflush(NULL)Jeff King
2014-04-21run_external_diff: clean up error handlingJeff King
2014-04-21run_external_diff: use an argv_array for the environmentJeff King
2014-04-21run_external_diff: use an argv_array for the command lineJeff King
2014-04-17i18n: remove obsolete comments for translators in diffstat generationJiang Xin
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov
2014-03-31comments: fix misuses of "nor"Justin Lebar
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano
2014-03-18Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano
2014-03-18Merge branch 'dd/use-alloc-grow'Junio C Hamano
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano
2014-03-03diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko
2014-02-27Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano
2014-02-24diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy