summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano2010-08-031-1/+0
|\ \ \ | |/ / |/| |
| * | Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano2010-08-021-1/+0
* | | diff.c: fix a graph output bugBo Yang2010-07-081-2/+1
* | | Merge branch 'jl/status-ignore-submodules'Junio C Hamano2010-06-301-11/+4
|\ \ \
| * | | Add the option "--ignore-submodules" to "git status"Jens Lehmann2010-06-251-11/+4
* | | | Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano2010-06-301-1/+10
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann2010-06-111-1/+10
* | | Merge branch 'ab/blame-textconv'Junio C Hamano2010-06-271-8/+4
|\ \ \
| * | | textconv: make the API publicAxel Bonnet2010-06-111-8/+4
* | | | Merge branch 'maint'Junio C Hamano2010-06-221-1/+0
|\ \ \ \
| * \ \ \ Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-221-5/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-211-26/+35
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-5/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano2010-06-181-5/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-061-6/+17
* | | | | | | Merge branch 'by/diff-graph'Junio C Hamano2010-06-181-97/+312
|\ \ \ \ \ \ \
| * | | | | | | Make --color-words work well with --graphBo Yang2010-05-311-17/+104
| * | | | | | | Emit a whole line in one goBo Yang2010-05-311-5/+27
| * | | | | | | diff.c: Output the text graph padding before each diff lineBo Yang2010-05-311-53/+147
| * | | | | | | Add a prefix output callback to diff outputBo Yang2010-05-311-27/+35
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano2010-06-181-3/+3
|\ \ \ \ \ \ \
| * | | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland2010-05-311-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'ec/diff-noprefix-config'Junio C Hamano2010-06-181-1/+8
|\ \ \ \ \ \ \
| * | | | | | | diff: add configuration option for disabling diff prefixes.Eli Collins2010-05-181-1/+8
* | | | | | | | Merge branch 'bw/diff-metainfo-color'Junio C Hamano2010-06-131-26/+35
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | diff: fix coloring of extended diff headersBert Wesarg2010-05-191-26/+35
* | | | | | | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-131-5/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |