summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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-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-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
2009-11-20No diff -b/-w output for all-whitespace changesGreg Bacon1-8/+27
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano1-8/+12
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano1-145/+262
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano1-8/+12
2009-10-31diff --color-words: bit of clean-upJunio C Hamano1-14/+12
2009-10-30Merge branch 'js/diff-verbose-submodule'Junio C Hamano1-0/+18
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin1-0/+6
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+18
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano1-145/+262
2009-10-11diff.c: stylefixFelipe Contreras1-1/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano1-21/+46
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-14/+35
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-148/+148
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-42/+113
2009-09-15diff -B: colour whitespace errorsJunio C Hamano1-26/+49
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano1-7/+9
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano1-7/+26
2009-09-14diff.c: shuffling code aroundJunio C Hamano1-125/+125
2009-09-14diff --whitespace: fix blank lines at endJunio C Hamano1-21/+53
2009-09-04diff --color: color blank-at-eofJunio C Hamano1-10/+27
2009-09-04diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano1-16/+48
2009-09-04diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano1-3/+7
2009-09-04diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano1-23/+9
2009-08-31Style fixes, add a space after if/for/while.Brian Gianforcaro1-1/+1
2009-08-30diff.c: fix typoes in commentsJim Meyering1-2/+2
2009-08-23Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy1-1/+1
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano1-2/+2
2009-07-29diff: change semantics of "ignore whitespace" optionsJunio C Hamano1-3/+31
2009-07-09Merge branch 'rs/grep-p'Junio C Hamano1-0/+1
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-5/+5