summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | | | | diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-231-5/+8
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'jc/diff-irreversible-delete'Junio C Hamano2011-04-281-5/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | git diff -D: omit the preimage of deletesJunio C Hamano2011-04-021-5/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-281-0/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+26
* | | | | | | | Merge branch 'jh/dirstat'Junio C Hamano2011-04-281-5/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-121-1/+1
| * | | | | | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-111-1/+18
| * | | | | | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-111-5/+20
* | | | | | | Remove unused variablesJohannes Schindelin2011-03-221-2/+1
| |/ / / / / |/| | | | |
* | | | | | Fix sparse warningsStephen Boyd2011-03-221-1/+1
* | | | | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | bump rename limit defaults (again)Jeff King2011-02-211-1/+1
| |/ / / /
* | | | | Merge branch 'jk/diffstat-binary' into maintJunio C Hamano2011-03-161-10/+21
|\ \ \ \ \
| * | | | | diff: don't retrieve binary blobs for diffstatJeff King2011-02-221-4/+11
| * | | | | diff: handle diffstat of rewritten binary filesJeff King2011-02-221-10/+14
* | | | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-161-4/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano2010-12-211-2/+2
|\ \ \ \ \
| * | | | | fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov2010-12-191-2/+2
| * | | | | Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano2010-12-091-2/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano2010-12-091-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-241-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-241-3/+8
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'kb/diff-C-M-synonym'Junio C Hamano2010-12-161-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson2010-12-101-9/+9
| * | | | | | | | | | diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard2010-11-291-1/+1
View Lorry Controller Status