summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-121-1/+1
|\
| * diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-011-1/+1
* | Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano2012-02-211-7/+20
|\ \
| * | diff --stat: show bars of same length for paths with same amount of changesjc/diff-stat-scalerJunio C Hamano2012-02-141-7/+20
* | | Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-5/+51
* | | Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano2012-01-181-0/+9
|\ \ \ | |/ / |/| |
| * | word-diff: ignore '\ No newline at eof' markertr/maint-word-diff-incomplete-lineThomas Rast2012-01-121-0/+9
* | | Merge branch 'rs/diff-whole-function'Junio C Hamano2011-10-191-0/+8
|\ \ \
| * | | diff: add option to show whole functions as contextrs/diff-whole-functionRené Scharfe2011-10-101-0/+8
* | | | Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano2011-10-131-0/+4
|\ \ \ \
| * | | | diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano2011-10-031-0/+4
* | | | | Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano2011-10-101-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | diff: teach --stat/--numstat to honor -U$numJunio C Hamano2011-09-221-0/+2
* | | | | Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-281-28/+25
|\ \ \ \ \
| * | | | | diff: don't load color config in plumbingJeff King2011-08-191-1/+4
| * | | | | color: delay auto-color decision until point of useJeff King2011-08-191-10/+7
| * | | | | git_config_colorbool: refactor stdout_is_tty handlingJeff King2011-08-181-2/+2
| * | | | | diff: refactor COLOR_DIFF from a flag into an intJeff King2011-08-181-22/+19
| | |_|/ / | |/| | |
| * | | | Merge branch 'jc/zlib-wrap' into maintJunio C Hamano2011-08-161-5/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-161-13/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'rc/histogram-diff'Junio C Hamano2011-08-171-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | teach --histogram to diffTay Ray Chuan2011-07-121-0/+2
| |/ / / / /
* | | | | | Merge branch 'jc/zlib-wrap'Junio C Hamano2011-07-191-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-101-1/+1
| * | | | | zlib: wrap deflateBound() tooJunio C Hamano2011-06-101-1/+1
| * | | | | zlib: wrap deflate side of the APIJunio C Hamano2011-06-101-3/+3
| * | | | | Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-311-0/+26
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano2011-05-261-2/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-131-6/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-041-5/+37
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-291-9/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff --stat-count: finishing touchesJunio C Hamano2011-05-271-2/+4
| * | | | | | | | | | diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-271-4/+34
| * | | | | | | | | | diff.c: omit hidden entries from namelen calculation with --statMichael J Gruber2011-05-271-5/+9
* | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano2011-06-291-13/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | refactor get_textconv to not require diff_filespecJeff King2011-05-231-13/+1
* | | | | | | | | | Merge branch 'jk/diff-not-so-quick'Junio C Hamano2011-06-061-0/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: futureproof "stop feeding the backend early" logicJunio C Hamano2011-05-311-0/+7
* | | | | | | | | | | Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano2011-05-231-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | do not read beyond end of malloc'd bufferJim Meyering2011-05-201-2/+10
* | | | | | | | | | Merge branch 'jh/dirstat-lines'Junio C Hamano2011-05-131-19/+152
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Mark dirstat error messages for translationJohan Herland2011-04-291-4/+4
| * | | | | | | | | | Improve error handling when parsing dirstat parametersJohan Herland2011-04-291-30/+41
| * | | | | | | | | | New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland2011-04-291-2/+59
| * | | | | | | | | | Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland2011-04-291-10/+16
| * | | | | | | | | | Add config variable for specifying default --dirstat behaviorJohan Herland2011-04-291-1/+9
| * | | | | | | | | | Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland2011-04-291-9/+60
| * | | | | | | | | | Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland2011-04-291-2/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano2011-05-061-6/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-231-4/+1
View Lorry Controller Status