Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | textconv: make the API public | Axel Bonnet | 2010-06-11 | |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-22 | |
|\ \ \ \ \ \ | ||||
| * \ \ \ \ \ | Merge branch 'cc/maint-diff-CC-binary' into maint | Junio C Hamano | 2010-06-22 | |
| |\ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'bw/diff-metainfo-color' into maint | Junio C Hamano | 2010-06-21 | |
| |\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 2010-06-21 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||
* | | | | | | | | | Merge branch 'cc/maint-diff-CC-binary' | Junio C Hamano | 2010-06-18 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||
| * | | | | | | | | diff: fix "git show -C -C" output when renaming a binary file | Christian Couder | 2010-06-06 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'by/diff-graph' | Junio C Hamano | 2010-06-18 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | Make --color-words work well with --graph | Bo Yang | 2010-05-31 | |
| * | | | | | | | | Emit a whole line in one go | Bo Yang | 2010-05-31 | |
| * | | | | | | | | diff.c: Output the text graph padding before each diff line | Bo Yang | 2010-05-31 | |
| * | | | | | | | | Add a prefix output callback to diff output | Bo Yang | 2010-05-31 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||
* | | | | | | | | Merge branch 'jh/diff-index-line-abbrev' | Junio C Hamano | 2010-06-18 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s | Johan Herland | 2010-05-31 | |
| |/ / / / / / / | ||||
* | | | | | | | | Merge branch 'ec/diff-noprefix-config' | Junio C Hamano | 2010-06-18 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | diff: add configuration option for disabling diff prefixes. | Eli Collins | 2010-05-18 | |
* | | | | | | | | | Merge branch 'bw/diff-metainfo-color' | Junio C Hamano | 2010-06-13 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| * | | | | | | | | diff: fix coloring of extended diff headers | Bert Wesarg | 2010-05-19 | |
* | | | | | | | | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | ||||
| * | | | | | | | git diff too slow for a file | René Scharfe | 2010-05-02 | |
* | | | | | | | | Merge branch 'by/log-follow' | Junio C Hamano | 2010-05-21 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | Make diffcore_std only can run once before a diff_flush | Bo Yang | 2010-05-07 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||
| * | | | | | | | Add a macro DIFF_QUEUE_CLEAR. | Bo Yang | 2010-05-07 | |
| | |_|_|_|/ / | |/| | | | | | ||||
* | | | | | | | Merge branch 'tr/word-diff' | Junio C Hamano | 2010-05-21 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | diff: add --word-diff option that generalizes --color-words | Thomas Rast | 2010-04-14 | |
* | | | | | | | | 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 | |
| |/ / / / |