summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-01-271-2/+2
|\
| * diff_filespec: drop xfrm_flags fieldJeff King2014-01-171-2/+2
* | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-101-0/+5
|\ \
| * | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-181-0/+5
* | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-271-3/+17
|\ \ \
| * | | diff.c: fix some recent whitespace style violationszk/difftool-countsJeff King2013-12-161-2/+2
| * | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-061-3/+17
| | |/ | |/|
* | | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-171-28/+28
|\ \ \ | |_|/ |/| |
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-28/+28
| |/
* | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-311-1/+1
|/
* Merge branch 'mg/more-textconv'Junio C Hamano2013-10-231-0/+3
|\
| * diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-101-0/+3
* | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-091-21/+104
|\ \
| * | diff: deprecate -q option to diff-filesjc/diff-filter-negationJunio C Hamano2013-07-191-0/+8
| * | diff: allow lowercase letter to specify what change class to excludeJunio C Hamano2013-07-171-1/+28
| * | diff: reject unknown change class given to --diff-filterJunio C Hamano2013-07-171-1/+1
| * | diff: preparse --diff-filter string argumentJunio C Hamano2013-07-171-7/+56
| * | diff: factor out match_filter()Junio C Hamano2013-07-171-16/+13
| * | diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano2013-07-171-2/+4
* | | diff: fix a possible null pointer dereferenceStefan Beller2013-08-091-1/+1
* | | diff: remove ternary operator evaluating always to trueStefan Beller2013-08-091-2/+2
* | | Merge branch 'ob/typofixes'Junio C Hamano2013-07-241-1/+1
|\ \ \
| * | | typofix: in-code commentsOndřej Bílka2013-07-221-1/+1
* | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-241-3/+1
|\ \ \ \ | |/ / / |/| | |
| * | | diff.c: Do not initialize a variable, which gets reassigned anyway.sb/misc-fixesStefan Beller2013-07-151-3/+1
| |/ /
| * | Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2013-04-241-2/+3
| |\ \
* | \ \ Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-1/+1
|\ \ \ \
| * | | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-1/+1
* | | | | Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-221-12/+18
|\ \ \ \ \
| * | | | | diff: allow --patch & cie to override -s/--no-patchMatthieu Moy2013-07-171-11/+17
| * | | | | diff: allow --no-patch as synonym for -sMatthieu Moy2013-07-171-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-111-1/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-251-1/+9
* | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-191-0/+2
| |/ / / |/| | |
* | | | Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano2013-04-151-0/+1
|\ \ \ \
| * | | | submodule: print graph output next to submodule logJohn Keeping2013-04-051-0/+1
| * | | | Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-251-1/+13
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano2013-04-151-2/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-051-2/+3
* | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-1/+1
* | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-011-1/+13
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-261-7/+10
| * | | diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-231-1/+10
* | | | diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy2013-03-211-1/+1
* | | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-171-0/+34
|\ \ \ \ | | |/ / | |/| |
| * | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-161-1/+11
| * | | config: Introduce diff.algorithm variableMichal Privoznik2013-01-161-0/+24
* | | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-141-97/+34
|\ \ \ \
| * | | | diff.c: use diff_line_prefix() where applicableJohn Keeping2013-02-121-95/+20
| * | | | diff: add diff_line_prefix functionJohn Keeping2013-02-121-0/+10
View Lorry Controller Status