summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2010-03-05Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano
2010-02-16Merge branch 'maint-1.6.6' into maintJunio C Hamano
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano
2010-02-16git diff --quiet -w: check and report the statusLarry D'Anna
2010-02-16diff: make sure --output=/bad/path is caughtLarry D'Anna
2010-02-04Typofixes outside documentation areaJunio C Hamano
2010-01-27Merge branch 'jl/diff-submodule-ignore'Junio C Hamano
2010-01-25Teach diff --submodule that modified submodule directory is dirtyJens Lehmann
2010-01-25Merge branch 'jc/fix-tree-walk'Junio C Hamano
2010-01-23Merge branch 'jl/submodule-diff'Junio C Hamano
2010-01-19Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano
2010-01-19Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano
2010-01-19Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano
2010-01-19Performance optimization for detection of modified submodulesJens Lehmann
2010-01-17Merge branch 'jk/run-command-use-shell'Junio C Hamano
2010-01-17Teach diff that modified submodule directory is dirtyJunio C Hamano
2010-01-13Merge branch 'nd/sparse'Junio C Hamano
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano
2010-01-06diff: run external diff helper with shellJeff King
2010-01-06textconv: use shell to run helperJeff King
2009-12-30Merge branch 'maint'Junio C Hamano
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano
2009-12-30textconv: stop leaking file descriptorsJeff King
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano
2009-12-16ignore unknown color configurationJeff King
2009-11-28Give the hunk comment its own colorBert Wesarg
2009-11-28emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano
2009-11-21No diff -b/-w output for all-whitespace changesGreg Bacon
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano
2009-11-16Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano
2009-11-16Merge branch 'js/maint-diff-color-words'Junio C Hamano
2009-10-31diff --color-words: bit of clean-upJunio C Hamano
2009-10-31Merge branch 'js/diff-verbose-submodule'Junio C Hamano
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin
2009-10-20Add the --submodule option to the diff option familyJohannes Schindelin
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano
2009-10-12diff.c: stylefixFelipe Contreras
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano
2009-09-15diff -B: colour whitespace errorsJunio C Hamano
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano
2009-09-15diff.c: shuffling code aroundJunio C Hamano
2009-09-15diff --whitespace: fix blank lines at endJunio C Hamano