aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneJeff King1-0/+3
2014-04-28Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano1-16/+16
2014-04-21run_external_diff: refactor cmdline setup logicJeff King1-11/+15
2014-04-21run_external_diff: hoist common bits out of conditionalJeff King1-5/+3
2014-04-21run_external_diff: drop fflush(NULL)Jeff King1-1/+0
2014-04-21run_external_diff: clean up error handlingJeff King1-6/+3
2014-04-21run_external_diff: use an argv_array for the environmentJeff King1-9/+5
2014-04-21run_external_diff: use an argv_array for the command lineJeff King1-16/+16
2014-04-17i18n: remove obsolete comments for translators in diffstat generationJiang Xin1-8/+0
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov1-0/+1
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov1-0/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano1-2/+3
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano1-24/+43
2014-03-18Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano1-6/+3
2014-03-18Merge branch 'dd/use-alloc-grow'Junio C Hamano1-10/+2
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano1-2/+3
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani1-6/+3
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-8/+0
2014-03-03diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko1-10/+2
2014-02-27Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano1-24/+43
2014-02-24diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy1-5/+17
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy1-21/+28
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast1-2/+3
2014-01-27Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano1-2/+2
2014-01-17diff_filespec: drop xfrm_flags fieldJeff King1-2/+2
2014-01-10Merge branch 'sb/diff-orderfile-config'Junio C Hamano1-0/+5
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano1-3/+17
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson1-0/+5
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-28/+28
2013-12-16diff.c: fix some recent whitespace style violationsJeff King1-2/+2
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger1-3/+17
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-28/+28
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier1-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano1-0/+3
2013-09-09Merge branch 'jc/diff-filter-negation'Junio C Hamano1-21/+104
2013-08-09diff: fix a possible null pointer dereferenceStefan Beller1-1/+1
2013-08-09diff: remove ternary operator evaluating always to trueStefan Beller1-2/+2
2013-07-24Merge branch 'ob/typofixes'Junio C Hamano1-1/+1
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano1-3/+1
2013-07-22typofix: in-code commentsOndřej Bílka1-1/+1
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-1/+1
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano1-12/+18
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano1-8/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano1-0/+8
2013-07-17diff: allow --patch & cie to override -s/--no-patchMatthieu Moy1-11/+17
2013-07-17diff: allow --no-patch as synonym for -sMatthieu Moy1-1/+1
2013-07-17diff: allow lowercase letter to specify what change class to excludeJunio C Hamano1-1/+28
2013-07-17diff: reject unknown change class given to --diff-filterJunio C Hamano1-1/+1