summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2010-05-19diff: fix coloring of extended diff headersLibravatar Bert Wesarg1-26/+35
2010-05-18diff-options: make --patch a synonym for -pLibravatar Will Palmer1-1/+1
2010-05-18diff: add configuration option for disabling diff prefixes.Libravatar Eli Collins1-1/+8
2010-05-08Merge branch 'jk/cached-textconv'Libravatar Junio C Hamano1-46/+73
2010-05-07Make diffcore_std only can run once before a diff_flushLibravatar Bo Yang1-0/+8
2010-05-07Add a macro DIFF_QUEUE_CLEAR.Libravatar Bo Yang1-8/+5
2010-05-04Merge branch 'maint-1.7.0' into maintLibravatar Junio C Hamano1-10/+5
2010-05-04remove ecb parameter from xdi_diff_outf()Libravatar René Scharfe1-10/+5
2010-05-02git diff too slow for a fileLibravatar René Scharfe1-5/+5
2010-04-22Merge branch 'jk/maint-diffstat-overflow' into maintLibravatar Junio C Hamano1-9/+12
2010-04-18Merge branch 'jk/maint-diffstat-overflow'Libravatar Junio C Hamano1-9/+12
2010-04-17diff: use large integers for diffstat calculationsLibravatar Jeff King1-9/+12
2010-04-14diff: add --word-diff option that generalizes --color-wordsLibravatar Thomas Rast1-19/+120
2010-04-09Merge branch 'jc/conflict-marker-size' into maintLibravatar Junio C Hamano1-13/+11
2010-04-08Merge early parts of jk/cached-textconvLibravatar Junio C Hamano1-0/+4
2010-04-08diff.c: work around pointer constness warningsLibravatar Junio C Hamano1-2/+2
2010-04-06Merge branch 'jc/conflict-marker-size'Libravatar Junio C Hamano1-13/+11
2010-04-02diff: avoid useless filespec populationLibravatar Jeff King1-5/+4
2010-04-02diff: cache textconv outputLibravatar Jeff King1-9/+43
2010-04-02textconv: refactor calls to run_textconvLibravatar Jeff King1-36/+30
2010-04-01fix textconv leak in emit_rewrite_diffLibravatar Jeff King1-0/+4
2010-03-31Sync with 1.7.0.4Libravatar Junio C Hamano1-6/+11
2010-03-30diff: fix textconv error zombiesLibravatar Johannes Sixt1-6/+11
2010-03-24diff --check: honor conflict-marker-size attributeLibravatar Junio C Hamano1-13/+11
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Libravatar Junio C Hamano1-2/+11
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesLibravatar Jens Lehmann1-2/+5
2010-03-12Refactor dirty submodule detection in diff-lib.cLibravatar Jens Lehmann1-0/+6
2010-03-04Merge branch 'ld/maint-diff-quiet-w' into maintLibravatar Junio C Hamano1-0/+23
2010-03-02Merge branch 'ld/maint-diff-quiet-w'Libravatar Junio C Hamano1-0/+23
2010-03-02Merge branch 'ml/color-when'Libravatar Junio C Hamano1-0/+9
2010-02-18Add an optional argument for --color optionsLibravatar Mark Lodato1-0/+9
2010-02-17Merge branch 'jc/typo' into maintLibravatar Junio C Hamano1-1/+1
2010-02-16Merge branch 'jc/typo'Libravatar Junio C Hamano1-1/+1
2010-02-16Merge branch 'maint-1.6.6' into maintLibravatar Junio C Hamano1-0/+2
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Libravatar Junio C Hamano1-0/+2
2010-02-15git diff --quiet -w: check and report the statusLibravatar Larry D'Anna1-0/+23
2010-02-15diff: make sure --output=/bad/path is caughtLibravatar Larry D'Anna1-0/+2
2010-02-03Typofixes outside documentation areaLibravatar Junio C Hamano1-1/+1
2010-01-26Merge branch 'jl/diff-submodule-ignore'Libravatar Junio C Hamano1-1/+1
2010-01-24Teach diff --submodule that modified submodule directory is dirtyLibravatar Jens Lehmann1-1/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Libravatar Junio C Hamano1-0/+17
2010-01-22Merge branch 'jl/submodule-diff'Libravatar Junio C Hamano1-5/+17
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Libravatar Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Libravatar Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Libravatar Junio C Hamano1-0/+2
2010-01-18Performance optimization for detection of modified submodulesLibravatar Jens Lehmann1-4/+11
2010-01-17Merge branch 'jk/run-command-use-shell'Libravatar Junio C Hamano1-1/+2
2010-01-16Teach diff that modified submodule directory is dirtyLibravatar Junio C Hamano1-2/+7
2010-01-13Merge branch 'nd/sparse'Libravatar Junio C Hamano1-1/+1
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Libravatar Junio C Hamano1-0/+2