summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano2010-06-221-5/+16
|\
| * diff: fix "git show -C -C" output when renaming a binary fileChristian Couder2010-06-061-6/+17
* | Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano2010-06-211-26/+35
|\ \
| * | diff: fix coloring of extended diff headersBert Wesarg2010-05-191-26/+35
* | | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-211-5/+5
|\ \ \
| * | | git diff too slow for a fileRené Scharfe2010-05-021-5/+5
* | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-041-10/+5
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-041-10/+5
| |/
| * Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano2010-04-221-9/+12
| |\
| * \ Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano2010-04-091-13/+11
| |\ \
* | \ \ Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano2010-04-181-9/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | diff: use large integers for diffstat calculationsJeff King2010-04-171-9/+12
* | | | Merge early parts of jk/cached-textconvJunio C Hamano2010-04-081-0/+4
|\ \ \ \
| * | | | diff.c: work around pointer constness warningsJunio C Hamano2010-04-081-2/+2
| * | | | fix textconv leak in emit_rewrite_diffJeff King2010-04-011-0/+4
* | | | | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-061-13/+11
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-241-13/+11
| |/ /
* | | 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
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status