aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano2014-01-27
|\
| * diff_filespec: drop xfrm_flags fieldJeff King2014-01-17
* | Merge branch 'sb/diff-orderfile-config'Junio C Hamano2014-01-10
|\ \
| * | diff: add diff.orderfile configuration variableSamuel Bronson2013-12-18
* | | Merge branch 'zk/difftool-counts'Junio C Hamano2013-12-27
|\ \ \
| * | | diff.c: fix some recent whitespace style violationsJeff King2013-12-16
| * | | difftool: display the number of files in the diff queue in the promptZoltan Klinger2013-12-06
| | |/ | |/|
* | | Merge branch 'cc/starts-n-ends-with'Junio C Hamano2013-12-17
|\ \ \ | |_|/ |/| |
| * | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
| |/
* | Use the word 'stuck' instead of 'sticked'Nicolas Vigier2013-10-31
|/
* Merge branch 'mg/more-textconv'Junio C Hamano2013-10-23
|\
| * diff_opt: track whether flags have been set explicitlyJunio C Hamano2013-05-10
* | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-09
|\ \
| * | diff: deprecate -q option to diff-filesJunio C Hamano2013-07-19
| * | diff: allow lowercase letter to specify what change class to excludeJunio C Hamano2013-07-17
| * | diff: reject unknown change class given to --diff-filterJunio C Hamano2013-07-17
| * | diff: preparse --diff-filter string argumentJunio C Hamano2013-07-17
| * | diff: factor out match_filter()Junio C Hamano2013-07-17
| * | diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano2013-07-17
* | | diff: fix a possible null pointer dereferenceStefan Beller2013-08-09
* | | diff: remove ternary operator evaluating always to trueStefan Beller2013-08-09
* | | Merge branch 'ob/typofixes'Junio C Hamano2013-07-24
|\ \ \
| * | | typofix: in-code commentsOndřej Bílka2013-07-22
* | | | Merge branch 'sb/misc-fixes'Junio C Hamano2013-07-24
|\ \ \ \ | |/ / / |/| | |
| * | | diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller2013-07-15
| |/ /
| * | Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano2013-04-24
| |\ \
* | \ \ Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-22
|\ \ \ \
| * | | | Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
* | | | | Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano2013-07-22
|\ \ \ \ \
| * | | | | diff: allow --patch & cie to override -s/--no-patchMatthieu Moy2013-07-17
| * | | | | diff: allow --no-patch as synonym for -sMatthieu Moy2013-07-17
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-25
* | | | | diff: add --ignore-blank-lines optionAntoine Pelisse2013-06-19
| |/ / / |/| | |
* | | | Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano2013-04-15
|\ \ \ \
| * | | | submodule: print graph output next to submodule logJohn Keeping2013-04-05
| * | | | Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano2013-03-25
| |\ \ \ \
* | \ \ \ \ Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano2013-04-15
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | diff: allow unstuck arguments with --diff-algorithmJohn Keeping2013-04-05
* | | | | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-01
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | diff: prevent pprint_rename from underrunning inputThomas Rast2013-02-26
| * | | diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse2013-02-23
* | | | diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy2013-03-21
* | | | Merge branch 'mp/diff-algo-config'Junio C Hamano2013-02-17
|\ \ \ \ | | |/ / | |/| |
| * | | diff: Introduce --diff-algorithm command line optionMichal Privoznik2013-01-16
| * | | config: Introduce diff.algorithm variableMichal Privoznik2013-01-16
* | | | Merge branch 'jk/diff-graph-cleanup'Junio C Hamano2013-02-14
|\ \ \ \
| * | | | diff.c: use diff_line_prefix() where applicableJohn Keeping2013-02-12
| * | | | diff: add diff_line_prefix functionJohn Keeping2013-02-12