aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano2011-05-13
|\
| * diff: remove often unused parameters from diff_unmerge()Junio C Hamano2011-04-23
| * diff.c: return filepair from diff_unmerge()Junio C Hamano2011-04-23
* | Merge branch 'jh/dirstat' into maintJunio C Hamano2011-05-04
|\ \
| * | --dirstat: In case of renames, use target filename instead of source filenameJohan Herland2011-04-12
| * | Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland2011-04-11
| * | --dirstat-by-file: Make it faster and more correctJohan Herland2011-04-11
* | | Remove unused variablesJohannes Schindelin2011-03-22
* | | Fix sparse warningsStephen Boyd2011-03-22
* | | Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-19
|\ \ \ | |/ / |/| |
| * | bump rename limit defaults (again)Jeff King2011-02-21
* | | Merge branch 'jk/diffstat-binary' into maintJunio C Hamano2011-03-16
|\ \ \
| * | | diff: don't retrieve binary blobs for diffstatJeff King2011-02-22
| * | | diff: handle diffstat of rewritten binary filesJeff King2011-02-22
* | | | standardize brace placement in struct definitionsJonathan Nieder2011-03-16
| |/ / |/| |
* | | Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano2010-12-21
|\ \ \
| * | | fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov2010-12-19
| * | | Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano2010-12-09
| |\ \ \
| * \ \ \ Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano2010-12-09
| |\ \ \ \
| * \ \ \ \ Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-24
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'kb/diff-C-M-synonym'Junio C Hamano2010-12-16
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson2010-12-10
| * | | | | | | | diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard2010-11-29
* | | | | | | | | Merge branch 'jk/diff-CBM'Junio C Hamano2010-12-08
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff: report bogus input to -C/-M/-BJeff King2010-10-21
* | | | | | | | | | Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano2010-11-29
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | diff: don't presume empty file when corresponding object is missingNicolas Pitre2010-10-21
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'cm/diff-check-at-eol'Junio C Hamano2010-11-29
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff --check: correct line numbers of new blank lines at EOFChristoph Mallon2010-10-16
* | | | | | | | Merge branch 'cb/diff-fname-optim'Junio C Hamano2010-11-17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | do not search functions for patch IDClemens Buchacher2010-09-23
* | | | | | | | Merge branch 'jk/no-textconv-symlink'Junio C Hamano2010-11-17
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff: don't use pathname-based diff drivers for symlinksJeff King2010-09-23
| |/ / / / / /
* | | | | | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-26
|\ \ \ \ \ \ \
| * | | | | | | diff: add synonyms for -M, -C, -BKevin Ballard2010-09-29
| * | | | | | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-29
* | | | | | | | Merge branch 'maint'Junio C Hamano2010-10-26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fix copy-pasted comments related to tree diff handling.Yann Dirson2010-10-25
* | | | | | | Merge branch 'jc/pickaxe-grep'Junio C Hamano2010-09-29
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-31
| * | | | | | diff: pass the entire diff-options to diffcore_pickaxe()Junio C Hamano2010-08-31
* | | | | | | diff: trivial fix for --output file error messageMatthieu Moy2010-09-29
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'maint'Junio C Hamano2010-09-09
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey2010-09-09
* | | | | | Merge branch 'cb/binary-patch-id'Junio C Hamano2010-08-31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | hash binary sha1 into patch idClemens Buchacher2010-08-16
* | | | | | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-21
|\ \ \ \ \ \
| * | | | | | diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy2010-08-06
| * | | | | | diff: split off a function for --stat-* option parsingJonathan Nieder2010-08-06