summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2010-07-08diff.c: fix a graph output bugBo Yang-2/+1
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano-11/+4
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano-1/+10
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano-8/+4
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann-11/+4
2010-06-22Merge branch 'maint'Junio C Hamano-1/+0
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano-5/+16
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano-26/+35
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano-5/+5
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano-5/+16
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano-97/+312
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano-3/+3
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano-1/+8
2010-06-13Merge branch 'bw/diff-metainfo-color'Junio C Hamano-26/+35
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano-5/+5
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann-1/+10
2010-06-11textconv: make the API publicAxel Bonnet-8/+4
2010-06-06diff: fix "git show -C -C" output when renaming a binary fileChristian Couder-6/+17
2010-05-31Make --color-words work well with --graphBo Yang-17/+104
2010-05-31Emit a whole line in one goBo Yang-5/+27
2010-05-31diff.c: Output the text graph padding before each diff lineBo Yang-53/+147
2010-05-31Add a prefix output callback to diff outputBo Yang-27/+35
2010-05-31diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland-3/+3
2010-05-21Merge branch 'by/log-follow'Junio C Hamano-8/+13
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano-19/+120
2010-05-19diff: fix coloring of extended diff headersBert Wesarg-26/+35
2010-05-18diff-options: make --patch a synonym for -pWill Palmer-1/+1
2010-05-18diff: add configuration option for disabling diff prefixes.Eli Collins-1/+8
2010-05-08Merge branch 'jk/cached-textconv'Junio C Hamano-46/+73
2010-05-07Make diffcore_std only can run once before a diff_flushBo Yang-0/+8
2010-05-07Add a macro DIFF_QUEUE_CLEAR.Bo Yang-8/+5
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano-10/+5
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe-10/+5
2010-05-02git diff too slow for a fileRené Scharfe-5/+5
2010-04-22Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano-9/+12
2010-04-18Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano-9/+12
2010-04-17diff: use large integers for diffstat calculationsJeff King-9/+12
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast-19/+120
2010-04-09Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano-13/+11
2010-04-08Merge early parts of jk/cached-textconvJunio C Hamano-0/+4
2010-04-08diff.c: work around pointer constness warningsJunio C Hamano-2/+2
2010-04-06Merge branch 'jc/conflict-marker-size'Junio C Hamano-13/+11
2010-04-02diff: avoid useless filespec populationJeff King-5/+4
2010-04-02diff: cache textconv outputJeff King-9/+43
2010-04-02textconv: refactor calls to run_textconvJeff King-36/+30
2010-04-01fix textconv leak in emit_rewrite_diffJeff King-0/+4
2010-03-31Sync with 1.7.0.4Junio C Hamano-6/+11
2010-03-30diff: fix textconv error zombiesJohannes Sixt-6/+11
2010-03-24diff --check: honor conflict-marker-size attributeJunio C Hamano-13/+11
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano-2/+11