Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 | 1 | -6/+6 |
|\ | |||||
| * | diff: remove often unused parameters from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -4/+1 |
| * | diff.c: return filepair from diff_unmerge() | Junio C Hamano | 2011-04-23 | 1 | -5/+8 |
* | | Merge branch 'jc/diff-irreversible-delete' | Junio C Hamano | 2011-04-28 | 1 | -5/+14 |
|\ \ | |||||
| * | | git diff -D: omit the preimage of deletes | Junio C Hamano | 2011-04-02 | 1 | -5/+14 |
* | | | Merge branch 'jc/rename-degrade-cc-to-c' | Junio C Hamano | 2011-04-28 | 1 | -0/+26 |
|\ \ \ | |||||
| * | | | diffcore-rename: fall back to -C when -C -C busts the rename limit | Junio C Hamano | 2011-03-22 | 1 | -0/+26 |
* | | | | Merge branch 'jh/dirstat' | Junio C Hamano | 2011-04-28 | 1 | -5/+37 |
|\ \ \ \ | |||||
| * | | | | --dirstat: In case of renames, use target filename instead of source filename | Johan Herland | 2011-04-12 | 1 | -1/+1 |
| * | | | | Teach --dirstat not to completely ignore rearranged lines within a file | Johan Herland | 2011-04-11 | 1 | -1/+18 |
| * | | | | --dirstat-by-file: Make it faster and more correct | Johan Herland | 2011-04-11 | 1 | -5/+20 |
* | | | | | Remove unused variables | Johannes Schindelin | 2011-03-22 | 1 | -2/+1 |
| |/ / / |/| | | | |||||
* | | | | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -1/+1 |
* | | | | Merge branch 'jk/merge-rename-ux' | Junio C Hamano | 2011-03-19 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | bump rename limit defaults (again) | Jeff King | 2011-02-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jk/diffstat-binary' into maint | Junio C Hamano | 2011-03-16 | 1 | -10/+21 |
|\ \ \ | |||||
| * | | | diff: don't retrieve binary blobs for diffstat | Jeff King | 2011-02-22 | 1 | -4/+11 |
| * | | | diff: handle diffstat of rewritten binary files | Jeff King | 2011-02-22 | 1 | -10/+14 |
* | | | | standardize brace placement in struct definitions | Jonathan Nieder | 2011-03-16 | 1 | -4/+2 |
| |/ / |/| | | |||||
* | | | Merge branch 'ks/blame-worktree-textconv-cached' | Junio C Hamano | 2010-12-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | fill_textconv(): Don't get/put cache if sha1 is not valid | Kirill Smelkov | 2010-12-19 | 1 | -2/+2 |
| * | | | Merge branch 'np/diff-in-corrupt-repository' into maint | Junio C Hamano | 2010-12-09 | 1 | -2/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'cm/diff-check-at-eol' into maint | Junio C Hamano | 2010-12-09 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'cb/diff-fname-optim' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/no-textconv-symlink' into maint | Junio C Hamano | 2010-11-24 | 1 | -3/+8 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'kb/diff-C-M-synonym' | Junio C Hamano | 2010-12-16 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff: use "find" instead of "detect" as prefix for long forms of -M and -C | Yann Dirson | 2010-12-10 | 1 | -9/+9 |
| * | | | | | | | | diff: add --detect-copies-harder as a synonym for --find-copies-harder | Kevin Ballard | 2010-11-29 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/diff-CBM' | Junio C Hamano | 2010-12-08 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: report bogus input to -C/-M/-B | Jeff King | 2010-10-21 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'np/diff-in-corrupt-repository' | Junio C Hamano | 2010-11-29 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | diff: don't presume empty file when corresponding object is missing | Nicolas Pitre | 2010-10-21 | 1 | -2/+6 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'cm/diff-check-at-eol' | Junio C Hamano | 2010-11-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | diff --check: correct line numbers of new blank lines at EOF | Christoph Mallon | 2010-10-16 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'cb/diff-fname-optim' | Junio C Hamano | 2010-11-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | do not search functions for patch ID | Clemens Buchacher | 2010-09-23 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jk/no-textconv-symlink' | Junio C Hamano | 2010-11-17 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | diff: don't use pathname-based diff drivers for symlinks | Jeff King | 2010-09-23 | 1 | -3/+8 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'kb/merge-recursive-rename-threshold' | Junio C Hamano | 2010-10-26 | 1 | -6/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: add synonyms for -M, -C, -B | Kevin Ballard | 2010-09-29 | 1 | -3/+22 |
| * | | | | | | | merge-recursive: option to specify rename threshold | Kevin Ballard | 2010-09-29 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-10-26 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Fix copy-pasted comments related to tree diff handling. | Yann Dirson | 2010-10-25 | 1 | -2/+2 |
* | | | | | | | Merge branch 'jc/pickaxe-grep' | Junio C Hamano | 2010-09-29 | 1 | -3/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | git log/diff: add -G<regexp> that greps in the patch text | Junio C Hamano | 2010-08-31 | 1 | -2/+7 |
| * | | | | | | diff: pass the entire diff-options to diffcore_pickaxe() | Junio C Hamano | 2010-08-31 | 1 | -1/+1 |
* | | | | | | | diff: trivial fix for --output file error message | Matthieu Moy | 2010-09-29 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-09-09 | 1 | -1/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | diff.c: call regfree to free memory allocated by regcomp when necessary | Brandon Casey | 2010-09-09 | 1 | -1/+4 |
* | | | | | | Merge branch 'cb/binary-patch-id' | Junio C Hamano | 2010-08-31 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | |