aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-19/+120
2010-04-09Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano1-13/+11
2010-04-08Merge early parts of jk/cached-textconvJunio C Hamano1-0/+4
2010-04-08diff.c: work around pointer constness warningsJunio C Hamano1-2/+2
2010-04-06Merge branch 'jc/conflict-marker-size'Junio C Hamano1-13/+11
2010-04-02diff: avoid useless filespec populationJeff King1-5/+4
2010-04-02diff: cache textconv outputJeff King1-9/+43
2010-04-02textconv: refactor calls to run_textconvJeff King1-36/+30
2010-04-01fix textconv leak in emit_rewrite_diffJeff King1-0/+4
2010-03-31Sync with 1.7.0.4Junio C Hamano1-6/+11
2010-03-30diff: fix textconv error zombiesJohannes Sixt1-6/+11
2010-03-24diff --check: honor conflict-marker-size attributeJunio C Hamano1-13/+11
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano1-2/+11
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann1-2/+5
2010-03-12Refactor dirty submodule detection in diff-lib.cJens Lehmann1-0/+6
2010-03-04Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano1-0/+23
2010-03-02Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano1-0/+23
2010-03-02Merge branch 'ml/color-when'Junio C Hamano1-0/+9
2010-02-18Add an optional argument for --color optionsMark Lodato1-0/+9
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano1-1/+1
2010-02-16Merge branch 'jc/typo'Junio C Hamano1-1/+1
2010-02-16Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+2
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano1-0/+2
2010-02-15git diff --quiet -w: check and report the statusLarry D'Anna1-0/+23
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna1-0/+2
2010-02-03Typofixes outside documentation areaJunio C Hamano1-1/+1
2010-01-26Merge branch 'jl/diff-submodule-ignore'Junio C Hamano1-1/+1
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann1-1/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-0/+17
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano1-5/+17
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano1-0/+2
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann1-4/+11
2010-01-17Merge branch 'jk/run-command-use-shell'Junio C Hamano1-1/+2
2010-01-16Teach diff that modified submodule directory is dirtyJunio C Hamano1-2/+7
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-1/+1
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-0/+2
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-0/+17
2010-01-05diff: run external diff helper with shellJeff King1-1/+1
2010-01-05textconv: use shell to run helperJeff King1-0/+1
2009-12-30Merge branch 'maint'Junio C Hamano1-0/+2
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+2
2009-12-30textconv: stop leaking file descriptorsJeff King1-0/+2
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano1-8/+27
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano1-5/+33
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano1-1/+3
2009-12-16ignore unknown color configurationJeff King1-1/+3
2009-11-28Give the hunk comment its own colorBert Wesarg1-3/+40
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano1-6/+7