aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* Merge early parts of jk/cached-textconvJunio C Hamano2010-04-08
|\
| * diff.c: work around pointer constness warningsJunio C Hamano2010-04-08
| * fix textconv leak in emit_rewrite_diffJeff King2010-04-01
* | Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-06
|\ \ | |/ |/|
| * diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-24
* | Sync with 1.7.0.4Junio C Hamano2010-03-31
|\ \
| * | diff: fix textconv error zombiesJohannes Sixt2010-03-30
| * | Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano2010-03-04
| |\ \
| * \ \ Merge branch 'jc/typo' into maintJunio C Hamano2010-02-17
| |\ \ \
* | \ \ \ Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano2010-03-24
|\ \ \ \ \
| * | | | | git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann2010-03-12
| * | | | | Refactor dirty submodule detection in diff-lib.cJens Lehmann2010-03-12
* | | | | | Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano2010-03-02
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | git diff --quiet -w: check and report the statusLarry D'Anna2010-02-15
| |/ / / /
* | | | | Merge branch 'ml/color-when'Junio C Hamano2010-03-02
|\ \ \ \ \
| * | | | | Add an optional argument for --color optionsMark Lodato2010-02-18
| |/ / / /
* | | | | Merge branch 'jc/typo'Junio C Hamano2010-02-16
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Typofixes outside documentation areaJunio C Hamano2010-02-03
| |/ /
* | | Merge branch 'maint-1.6.6' into maintJunio C Hamano2010-02-16
|\ \ \ | |/ / |/| |
| * | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-16
| |\ \
| | * | diff: make sure --output=/bad/path is caughtLarry D'Anna2010-02-15
| | * | Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano2010-01-18
| | |\ \
| | | * \ Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano2010-01-18
| | | |\ \
| | | | * \ Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano2010-01-18
| | | | |\ \
| | | | | * \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2010-01-10
| | | | | |\ \
| | | | | * \ \ Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-08
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-08
| | | | | |\ \ \ \
* | | | | | \ \ \ \ Merge branch 'jl/diff-submodule-ignore'Junio C Hamano2010-01-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach diff --submodule that modified submodule directory is dirtyJens Lehmann2010-01-24
* | | | | | | | | | | Merge branch 'jc/fix-tree-walk'Junio C Hamano2010-01-24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | unpack-trees.c: look ahead in the indexJunio C Hamano2010-01-07
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jl/submodule-diff'Junio C Hamano2010-01-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Performance optimization for detection of modified submodulesJens Lehmann2010-01-18
| * | | | | | | | | | Teach diff that modified submodule directory is dirtyJunio C Hamano2010-01-16
* | | | | | | | | | | Merge branch 'jk/run-command-use-shell'Junio C Hamano2010-01-17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | diff: run external diff helper with shellJeff King2010-01-05
| * | | | | | | | | | textconv: use shell to run helperJeff King2010-01-05
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-23
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-12-30
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-12-30
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | textconv: stop leaking file descriptorsJeff King2009-12-30
| | * | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano2009-05-03
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano2009-05-03
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano2009-12-26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No diff -b/-w output for all-whitespace changesGreg Bacon2009-11-20
* | | | | | | | | | Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano2009-12-26
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | diff.c: fix typoes in commentsJim Meyering2009-08-30
| * | | | | | | | | diff: Rename QUIET internal option to QUICKJunio C Hamano2009-07-29
| * | | | | | | | | diff: change semantics of "ignore whitespace" optionsJunio C Hamano2009-07-29
| | |_|_|_|/ / / / | |/| | | | | | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-20 09:10:24 +0000