summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger-3/+17
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder-28/+28
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano-0/+3
2013-09-09Merge branch 'jc/diff-filter-negation'Junio C Hamano-21/+104
2013-08-09diff: fix a possible null pointer dereferenceStefan Beller-1/+1
2013-08-09diff: remove ternary operator evaluating always to trueStefan Beller-2/+2
2013-07-24Merge branch 'ob/typofixes'Junio C Hamano-1/+1
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano-3/+1
2013-07-22typofix: in-code commentsOndřej Bílka-1/+1
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano-1/+1
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano-12/+18
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano-8/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano-0/+8
2013-07-17diff: allow --patch & cie to override -s/--no-patchMatthieu Moy-11/+17
2013-07-17diff: allow --no-patch as synonym for -sMatthieu Moy-1/+1
2013-07-17diff: allow lowercase letter to specify what change class to excludeJunio C Hamano-1/+28
2013-07-17diff: reject unknown change class given to --diff-filterJunio C Hamano-1/+1
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano-7/+56
2013-07-17diff: factor out match_filter()Junio C Hamano-16/+13
2013-07-17diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano-2/+4
2013-07-15diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller-3/+1
2013-07-11Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano-1/+9
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy-1/+1
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano-1/+9
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse-0/+2
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano-0/+3
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano-2/+3
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano-0/+1
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano-2/+3
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini-1/+1
2013-04-05submodule: print graph output next to submodule logJohn Keeping-0/+1
2013-04-05diff: allow unstuck arguments with --diff-algorithmJohn Keeping-2/+3
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano-1/+13
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano-1/+13
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy-1/+1
2013-02-26diff: prevent pprint_rename from underrunning inputThomas Rast-7/+10
2013-02-23diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse-1/+10
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano-0/+34
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano-97/+34
2013-02-12diff.c: use diff_line_prefix() where applicableJohn Keeping-95/+20
2013-02-12diff: add diff_line_prefix functionJohn Keeping-0/+10
2013-02-12diff.c: make constant string arguments constJohn Keeping-2/+4
2013-02-12diff: write prefix to the correct fileJohn Keeping-1/+1
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik-1/+11
2013-01-16config: Introduce diff.algorithm variableMichal Privoznik-0/+24
2013-01-14Merge branch 'jc/blame-no-follow'Junio C Hamano-0/+2
2012-11-29Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano-25/+29
2012-11-27diff --shortstat: do not count "unmerged" entriesJunio C Hamano-3/+2
2012-11-27diff --stat: do not count "unmerged" entriesJunio C Hamano-2/+4