summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | Merge branch 'jk/diff-CBM'Junio C Hamano2010-12-081-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: report bogus input to -C/-M/-BJeff King2010-10-211-3/+3
* | | | | | | | | Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano2010-11-291-2/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | diff: don't presume empty file when corresponding object is missingNicolas Pitre2010-10-211-2/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'cm/diff-check-at-eol'Junio C Hamano2010-11-291-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff --check: correct line numbers of new blank lines at EOFChristoph Mallon2010-10-161-1/+1
* | | | | | | Merge branch 'cb/diff-fname-optim'Junio C Hamano2010-11-171-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | do not search functions for patch IDClemens Buchacher2010-09-231-1/+1
* | | | | | | Merge branch 'jk/no-textconv-symlink'Junio C Hamano2010-11-171-3/+8
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | diff: don't use pathname-based diff drivers for symlinksJeff King2010-09-231-3/+8
| |/ / / / /
* | | | | | Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-6/+25
|\ \ \ \ \ \
| * | | | | | diff: add synonyms for -M, -C, -BKevin Ballard2010-09-291-3/+22
| * | | | | | merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-3/+3
* | | | | | | Merge branch 'maint'Junio C Hamano2010-10-261-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fix copy-pasted comments related to tree diff handling.Yann Dirson2010-10-251-2/+2
* | | | | | Merge branch 'jc/pickaxe-grep'Junio C Hamano2010-09-291-3/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano2010-08-311-2/+7
| * | | | | diff: pass the entire diff-options to diffcore_pickaxe()Junio C Hamano2010-08-311-1/+1
* | | | | | diff: trivial fix for --output file error messageMatthieu Moy2010-09-291-1/+1
* | | | | | Merge branch 'maint'Junio C Hamano2010-09-091-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey2010-09-091-1/+4
* | | | | | Merge branch 'cb/binary-patch-id'Junio C Hamano2010-08-311-0/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | hash binary sha1 into patch idClemens Buchacher2010-08-161-0/+7
* | | | | | Merge branch 'mm/shortopt-detached'Junio C Hamano2010-08-211-43/+124
|\ \ \ \ \ \
| * | | | | | diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy2010-08-061-5/+23
| * | | | | | diff: split off a function for --stat-* option parsingJonathan Nieder2010-08-061-27/+35
| * | | | | | diff: parse separate options like -S fooMatthieu Moy2010-08-061-16/+71
| |/ / / / /
* | | | | | Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano2010-08-181-14/+13
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | diff --follow: do call diffcore_std() as necessaryJunio C Hamano2010-08-131-14/+13
* | | | | | Merge branch 'jl/submodule-ignore-diff'Junio C Hamano2010-08-181-7/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin2010-08-091-1/+5
| * | | | | Submodules: Add the new "ignore" config option for diff and statusJens Lehmann2010-08-091-6/+29
| |/ / / /
* | | | | diff: strip extra "/" when stripping prefixJakub Narebski2010-08-111-2/+8
View Lorry Controller Status