summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani
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: 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
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini
2013-04-05submodule: print graph output next to submodule logJohn Keeping
2013-04-05diff: allow unstuck arguments with --diff-algorithmJohn Keeping
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy
2013-02-26diff: prevent pprint_rename from underrunning inputThomas Rast
2013-02-24diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano
2013-02-12diff.c: use diff_line_prefix() where applicableJohn Keeping
2013-02-12diff: add diff_line_prefix functionJohn Keeping
2013-02-12diff.c: make constant string arguments constJohn Keeping