Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | Merge branch 'rs/grep-p' | Junio C Hamano | 2009-07-09 | |
|\ \ \ \ \ | ||||
| * | | | | | userdiff: add xdiff_clear_find_func() | René Scharfe | 2009-07-01 | |
* | | | | | | Merge branch 'tr/die_errno' | Junio C Hamano | 2009-07-06 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||
| * | | | | | Use die_errno() instead of die() when checking syscalls | Thomas Rast | 2009-06-27 | |
| * | | | | | Convert existing die(..., strerror(errno)) to die_errno() | Thomas Rast | 2009-06-27 | |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-06-09 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||
| * | | | | | diff.c: plug a memory leak in an error path | Johannes Sixt | 2009-06-08 | |
| * | | | | | Merge branch 'ar/unlink-err' into maint | Junio C Hamano | 2009-05-25 | |
| |\ \ \ \ \ | ||||
* | | | | | | | diff: generate pretty filenames in prep_temp_blob() | David Aguilar | 2009-05-31 | |
* | | | | | | | convert bare readlink to strbuf_readlink | Jeff King | 2009-05-25 | |
* | | | | | | | Merge branch 'ar/unlink-err' | Junio C Hamano | 2009-05-18 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 | |
* | | | | | | | Merge branch 'mh/diff-stat-color' | Junio C Hamano | 2009-05-18 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| * | | | | | | diff: do not color --stat output like patch context | Markus Heidelberg | 2009-04-26 | |
| |/ / / / / | ||||
* | | | | | | Fix a bunch of pointer declarations (codestyle) | Felipe Contreras | 2009-05-01 | |
|/ / / / / | ||||
* | | | | | Allow users to un-configure rename detection | Linus Torvalds | 2009-04-11 | |
* | | | | | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' | Junio C Hamano | 2009-03-28 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||
| * | | | | diff --cached: do not borrow from a work tree when a path is marked as assume... | Junio C Hamano | 2009-03-22 | |
* | | | | | Merge branch 'js/maint-diff-temp-smudge' | Junio C Hamano | 2009-03-26 | |
|\ \ \ \ \ | ||||
| * | | | | | Smudge the files fed to external diff and textconv | Johannes Schindelin | 2009-03-22 | |
* | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' | Junio C Hamano | 2009-03-11 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||
| * | | | | | has_sha1_pack(): refactor "pretend these packs do not exist" interface | Junio C Hamano | 2009-02-28 | |
* | | | | | | Remove unused function scope local variables | Benjamin Kramer | 2009-03-07 | |
* | | | | | | Merge branch 'al/ansi-color' | Junio C Hamano | 2009-03-05 | |
|\ \ \ \ \ \ | ||||
| * | | | | | | Clean up use of ANSI color sequences | Arjen Laarhoven | 2009-02-13 | |
* | | | | | | | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking | Keith Cascio | 2009-03-04 | |
| |_|/ / / / |/| | | | | | ||||
* | | | | | | Remove redundant bit clears from diff_setup() | Keith Cascio | 2009-02-13 | |
|/ / / / / | ||||
* | | | | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed files | Nazri Ramliy | 2009-02-12 | |
* | | | | | Merge branch 'jc/maint-split-diff-metainfo' | Junio C Hamano | 2009-01-31 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||
| * | | | | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | * | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | |
| | |/ / | ||||
* | | | | Merge branch 'jk/signal-cleanup' | Junio C Hamano | 2009-01-31 | |
|\ \ \ \ | ||||
| * | | | | refactor signal handling for cleanup functions | Jeff King | 2009-01-21 | |
| * | | | | chain kill signals for cleanup functions | Jeff King | 2009-01-21 | |
| * | | | | diff: refactor tempfile cleanup handling | Jeff King | 2009-01-21 | |
* | | | | | Merge branch 'js/diff-color-words' | Junio C Hamano | 2009-01-25 | |
|\ \ \ \ \ | ||||
| * | | | | | color-words: Support diff.wordregex config option | Boyd Stephen Smith Jr | 2009-01-21 | |
| * | | | | | color-words: make regex configurable via attributes | Thomas Rast | 2009-01-17 | |
| * | | | | | color-words: enable REG_NEWLINE to help user | Thomas Rast | 2009-01-17 | |
| * | | | | | color-words: take an optional regular expression describing words | Johannes Schindelin | 2009-01-17 | |
| * | | | | | color-words: change algorithm to allow for 0-character word boundaries | Johannes Schindelin | 2009-01-17 | |
| * | | | | | color-words: refactor word splitting and use ALLOC_GROW() | Johannes Schindelin | 2009-01-17 | |
| |/ / / / | ||||
* | | | | | Merge branch 'js/patience-diff' | Junio C Hamano | 2009-01-23 | |
|\ \ \ \ \ | ||||
| * | | | | | Introduce the diff option '--patience' | Johannes Schindelin | 2009-01-07 | |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-21 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | ||||
| * | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty | Johannes Schindelin | 2009-01-21 | |
| |/ / / | ||||
* | | | | Merge branch 'rs/diff-ihc' | Junio C Hamano | 2009-01-07 | |
|\ \ \ \ | ||||
| * | | | | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | |
| |/ / / | ||||
* | | | | remove trailing LF in die() messages | Alexander Potashev | 2009-01-05 | |
|/ / / | ||||
* | | | Fix type-mismatch compiler warning from diff_populate_filespec() | René Scharfe | 2008-12-18 |