summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano
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: 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-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
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast
2014-01-27Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano
2014-01-17diff_filespec: drop xfrm_flags fieldJeff King
2014-01-10Merge branch 'sb/diff-orderfile-config'Junio C Hamano
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano
2013-12-19diff: add diff.orderfile configuration variableSamuel Bronson
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano
2013-12-16diff.c: fix some recent whitespace style violationsJeff King
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano
2013-09-09Merge branch 'jc/diff-filter-negation'Junio C Hamano
2013-08-09diff: fix a possible null pointer dereferenceStefan Beller
2013-08-09diff: remove ternary operator evaluating always to trueStefan Beller
2013-07-25Merge branch 'ob/typofixes'Junio C Hamano
2013-07-25Merge branch 'sb/misc-fixes'Junio C Hamano
2013-07-22typofix: in-code commentsOndřej Bílka
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano
2013-07-18diff: allow --patch & cie to override -s/--no-patchMatthieu Moy
2013-07-18diff: allow --no-patch as synonym for -sMatthieu Moy
2013-07-18diff: allow lowercase letter to specify what change class to excludeJunio C Hamano
2013-07-17diff: reject unknown change class given to --diff-filterJunio C Hamano
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano
2013-07-17diff: factor out match_filter()Junio C Hamano
2013-07-17diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano
2013-07-15diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller
2013-07-11Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy