summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-141-19/+120
* Sync with 1.7.0.4Junio C Hamano2010-03-311-6/+11
|\
| * diff: fix textconv error zombiesJohannes Sixt2010-03-301-6/+11
| * Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-041-0/+23
| |\
| * \ Merge branch 'jc/typo' into maintJunio C Hamano2010-02-171-1/+1
| |\ \
* | \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-241-2/+11
|\ \ \ \
| * | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-121-2/+5
| * | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-121-0/+6
* | | | | Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano2010-03-021-0/+23
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | git diff --quiet -w: check and report the statusLarry D'Anna2010-02-151-0/+23
| |/ / /
* | | | Merge branch 'ml/color-when'Junio C Hamano2010-03-021-0/+9
|\ \ \ \
| * | | | Add an optional argument for --color optionsMark Lodato2010-02-181-0/+9
| |/ / /
* | | | Merge branch 'jc/typo'Junio C Hamano2010-02-161-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Typofixes outside documentation areaJunio C Hamano2010-02-031-1/+1
| |/
* | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-161-0/+2
|\ \ | |/ |/|
| * Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-161-0/+2
| |\
| | * diff: make sure --output=/bad/path is caughtLarry D'Anna2010-02-151-0/+2
| | * Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-181-0/+2
| | |\
| | | * Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-181-0/+2
| | | |\
| | | | * Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-181-0/+2
| | | | |\
| | | | | * Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-101-0/+2
| | | | | |\
| | | | | * \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-081-1/+9
| | | | | |\ \
| | | | | * \ \ Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-081-1/+1
| | | | | |\ \ \
* | | | | | \ \ \ Merge branch 'jl/diff-submodule-ignore'Junio C Hamano2010-01-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Teach diff --submodule that modified submodule directory is dirtyJens Lehmann2010-01-241-1/+1
* | | | | | | | | | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-241-0/+17
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-071-0/+17
* | | | | | | | | | Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-221-5/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-181-4/+11
| * | | | | | | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-161-2/+7
* | | | | | | | | | | Merge branch 'jk/run-command-use-shell'Junio C Hamano2010-01-171-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | diff: run external diff helper with shellJeff King2010-01-051-1/+1
| * | | | | | | | | | textconv: use shell to run helperJeff King2010-01-051-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-231-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-301-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-301-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | textconv: stop leaking file descriptorsJeff King2009-12-301-0/+2
| | * | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-031-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-031-1/+9
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano2009-12-261-8/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No diff -b/-w output for all-whitespace changesGreg Bacon2009-11-201-8/+27
* | | | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-261-5/+33
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | diff.c: fix typoes in commentsJim Meyering2009-08-301-2/+2
| * | | | | | | | | diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-291-2/+2
| * | | | | | | | | diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-291-3/+31
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano2009-12-161-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | ignore unknown color configurationJeff King2009-12-161-1/+3
| * | | | | | | | Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano2009-11-161-8/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano2009-11-151-145/+262
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status