summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | git diff too slow for a fileRené Scharfe2010-05-021-5/+5
* | | | | | | | Merge branch 'by/log-follow'Junio C Hamano2010-05-211-8/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Make diffcore_std only can run once before a diff_flushBo Yang2010-05-071-0/+8
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Add a macro DIFF_QUEUE_CLEAR.Bo Yang2010-05-071-8/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-211-19/+120
|\ \ \ \ \ \ \
| * | | | | | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-141-19/+120
* | | | | | | | diff-options: make --patch a synonym for -pWill Palmer2010-05-181-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'jk/cached-textconv'Junio C Hamano2010-05-081-46/+73
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | diff: avoid useless filespec populationJeff King2010-04-021-5/+4
| * | | | | | diff: cache textconv outputJeff King2010-04-021-9/+43
| * | | | | | textconv: refactor calls to run_textconvJeff King2010-04-021-36/+30
* | | | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-041-10/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-041-10/+5
| | |_|/ / | |/| | |
| * | | | Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-221-9/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-091-13/+11
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano2010-04-181-9/+12
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | diff: use large integers for diffstat calculationsJeff King2010-04-171-9/+12
* | | | | | | Merge early parts of jk/cached-textconvJunio C Hamano2010-04-081-0/+4
|\ \ \ \ \ \ \
| * | | | | | | diff.c: work around pointer constness warningsJunio C Hamano2010-04-081-2/+2
| | |_|_|/ / / | |/| | | | |
| * | | | | | fix textconv leak in emit_rewrite_diffJeff King2010-04-011-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-061-13/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-241-13/+11
| |/ / /
* | | | Sync with 1.7.0.4Junio C Hamano2010-03-311-6/+11
|\ \ \ \ | | |/ / | |/| |
| * | | diff: fix textconv error zombiesJohannes Sixt2010-03-301-6/+11
| * | | Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-041-0/+23
| |\ \ \
| * \ \ \ Merge branch 'jc/typo' into maintJunio C Hamano2010-02-171-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-241-2/+11
|\ \ \ \ \ \
| * | | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-121-2/+5
| * | | | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-121-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano2010-03-021-0/+23
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | git diff --quiet -w: check and report the statusLarry D'Anna2010-02-151-0/+23
| |/ / / /
View Lorry Controller Status