summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2010-04-09Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano-13/+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-04Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano-0/+23
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano-1/+1
2010-02-16Merge branch 'maint-1.6.6' into maintJunio C Hamano-0/+2
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano-0/+2
2010-02-15git diff --quiet -w: check and report the statusLarry D'Anna-0/+23
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna-0/+2
2010-02-03Typofixes outside documentation areaJunio C Hamano-1/+1
2010-01-26Merge branch 'jl/diff-submodule-ignore'Junio C Hamano-1/+1
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann-1/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano-0/+17
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano-5/+17
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano-0/+2
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano-0/+2
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano-0/+2
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann-4/+11
2010-01-17Merge branch 'jk/run-command-use-shell'Junio C Hamano-1/+2
2010-01-16Teach diff that modified submodule directory is dirtyJunio C Hamano-2/+7
2010-01-13Merge branch 'nd/sparse'Junio C Hamano-1/+1
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano-0/+2
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano-0/+17
2010-01-05diff: run external diff helper with shellJeff King-1/+1
2010-01-05textconv: use shell to run helperJeff King-0/+1
2009-12-30Merge branch 'maint'Junio C Hamano-0/+2
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano-0/+2
2009-12-30textconv: stop leaking file descriptorsJeff King-0/+2
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano-8/+27
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano-5/+33
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano-1/+3
2009-12-16ignore unknown color configurationJeff King-1/+3
2009-11-28Give the hunk comment its own colorBert Wesarg-3/+40
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano-6/+7
2009-11-20No diff -b/-w output for all-whitespace changesGreg Bacon-8/+27
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano-8/+12
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano-145/+262
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano-8/+12
2009-10-31diff --color-words: bit of clean-upJunio C Hamano-14/+12
2009-10-30Merge branch 'js/diff-verbose-submodule'Junio C Hamano-0/+18
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin-0/+6
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin-0/+18
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano-145/+262
2009-10-11diff.c: stylefixFelipe Contreras-1/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano-22/+47
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano-14/+35
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano-148/+148
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano-42/+113
2009-09-15diff -B: colour whitespace errorsJunio C Hamano-26/+49
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano-7/+9