Commit message (Expand) | Author | Age | |
---|---|---|---|
* | diff-options: make --patch a synonym for -p | Will Palmer | 2010-05-18 |
* | Merge branch 'jk/cached-textconv' | Junio C Hamano | 2010-05-08 |
|\ | |||
| * | diff: avoid useless filespec population | Jeff King | 2010-04-02 |
| * | diff: cache textconv output | Jeff King | 2010-04-02 |
| * | textconv: refactor calls to run_textconv | Jeff King | 2010-04-02 |
* | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-04 |
|\ \ | |||
| * | | remove ecb parameter from xdi_diff_outf() | René Scharfe | 2010-05-04 |
| * | | Merge branch 'jk/maint-diffstat-overflow' into maint | Junio C Hamano | 2010-04-22 |
| |\ \ | |||
| * \ \ | Merge branch 'jc/conflict-marker-size' into maint | Junio C Hamano | 2010-04-09 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'jk/maint-diffstat-overflow' | Junio C Hamano | 2010-04-18 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| * | | | | diff: use large integers for diffstat calculations | Jeff King | 2010-04-17 |
* | | | | | Merge early parts of jk/cached-textconv | Junio C Hamano | 2010-04-08 |
|\ \ \ \ \ | |||
| * | | | | | diff.c: work around pointer constness warnings | Junio C Hamano | 2010-04-08 |
| | |_|_|/ | |/| | | | |||
| * | | | | fix textconv leak in emit_rewrite_diff | Jeff King | 2010-04-01 |
* | | | | | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-04-06 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||
| * | | | diff --check: honor conflict-marker-size attribute | Junio C Hamano | 2010-03-24 |
| |/ / | |||
* | | | Sync with 1.7.0.4 | Junio C Hamano | 2010-03-31 |
|\ \ \ | | |/ | |/| | |||
| * | | diff: fix textconv error zombies | Johannes Sixt | 2010-03-30 |
| * | | Merge branch 'ld/maint-diff-quiet-w' into maint | Junio C Hamano | 2010-03-04 |
| |\ \ | |||
| * \ \ | Merge branch 'jc/typo' into maint | Junio C Hamano | 2010-02-17 |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'jl/submodule-diff-dirtiness' | Junio C Hamano | 2010-03-24 |
|\ \ \ \ \ | |||
| * | | | | | git status: Fix false positive "new commits" output for dirty submodules | Jens Lehmann | 2010-03-12 |
| * | | | | | Refactor dirty submodule detection in diff-lib.c | Jens Lehmann | 2010-03-12 |
* | | | | | | Merge branch 'ld/maint-diff-quiet-w' | Junio C Hamano | 2010-03-02 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | git diff --quiet -w: check and report the status | Larry D'Anna | 2010-02-15 |
| |/ / / / | |||
* | | | | | Merge branch 'ml/color-when' | Junio C Hamano | 2010-03-02 |
|\ \ \ \ \ | |||
| * | | | | | Add an optional argument for --color options | Mark Lodato | 2010-02-18 |
| |/ / / / | |||
* | | | | | Merge branch 'jc/typo' | Junio C Hamano | 2010-02-16 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||
| * | | | Typofixes outside documentation area | Junio C Hamano | 2010-02-03 |
| |/ / | |||
* | | | Merge branch 'maint-1.6.6' into maint | Junio C Hamano | 2010-02-16 |
|\ \ \ | |/ / |/| | | |||
| * | | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 |
| |\ \ | |||
| | * | | diff: make sure --output=/bad/path is caught | Larry D'Anna | 2010-02-15 |
| | * | | Merge branch 'maint-1.6.4' into maint-1.6.5 | Junio C Hamano | 2010-01-18 |
| | |\ \ | |||
| | | * \ | Merge branch 'maint-1.6.3' into maint-1.6.4 | Junio C Hamano | 2010-01-18 |
| | | |\ \ | |||
| | | | * \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2010-01-18 |
| | | | |\ \ | |||
| | | | | * \ | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2010-01-10 |
| | | | | |\ \ | |||
| | | | | * \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint | Junio C Hamano | 2009-04-08 |
| | | | | |\ \ \ | |||
| | | | | * \ \ \ | Merge branch 'jc/maint-1.6.0-keep-pack' into maint | Junio C Hamano | 2009-04-08 |
| | | | | |\ \ \ \ | |||
* | | | | | \ \ \ \ | Merge branch 'jl/diff-submodule-ignore' | Junio C Hamano | 2010-01-26 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Teach diff --submodule that modified submodule directory is dirty | Jens Lehmann | 2010-01-24 |
* | | | | | | | | | | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
* | | | | | | | | | | Merge branch 'jl/submodule-diff' | Junio C Hamano | 2010-01-22 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Performance optimization for detection of modified submodules | Jens Lehmann | 2010-01-18 |
| * | | | | | | | | | | Teach diff that modified submodule directory is dirty | Junio C Hamano | 2010-01-16 |
* | | | | | | | | | | | Merge branch 'jk/run-command-use-shell' | Junio C Hamano | 2010-01-17 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||
| * | | | | | | | | | | diff: run external diff helper with shell | Jeff King | 2010-01-05 |
| * | | | | | | | | | | textconv: use shell to run helper | Jeff King | 2010-01-05 |
| |/ / / / / / / / / | |||
* | | | | | | | | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Teach Git to respect skip-worktree bit (reading part) | Nguyễn Thái Ngọc Duy | 2009-08-23 |
| | |_|_|/ / / / / / | |/| | | | | | | | |