| Commit message (Expand) | Author | Age |
* | 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 |
* | | Make 'prepare_temp_file()' ignore st_size for symlinks | Linus Torvalds | 2008-12-17 |
* | | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' | Linus Torvalds | 2008-12-17 |
* | | diff: respect textconv in rewrite diffs | Jeff King | 2008-12-09 |
* | | diff: fix handling of binary rewrite diffs | Jeff King | 2008-12-09 |
* | | diff: allow turning on textconv explicitly for plumbing | Jeff King | 2008-12-07 |
* | | Merge branch 'jk/diff-convfilter' | Junio C Hamano | 2008-11-12 |
|\ \ |
|
| * | | only textconv regular files | Jeff King | 2008-10-26 |
| * | | userdiff: require explicitly allowing textconv | Jeff King | 2008-10-26 |
| * | | refactor userdiff textconv code | Jeff King | 2008-10-26 |
* | | | Merge branch 'jk/diff-convfilter-test-fix' | Junio C Hamano | 2008-11-12 |
|\ \ \
| |/ / |
|
| * | | diff: add missing static declaration | Jeff King | 2008-10-26 |
* | | | Merge branch 'rs/blame' | Junio C Hamano | 2008-11-08 |
|\ \ \
| |/ /
|/| | |
|
| * | | Always initialize xpparam_t to 0 | Brian Downing | 2008-10-25 |
* | | | diff: add filter for converting binary to text | Jeff King | 2008-10-18 |
* | | | diff: introduce diff.<driver>.binary | Jeff King | 2008-10-18 |
* | | | diff: unify external diff and funcname parsing code | Jeff King | 2008-10-18 |
|/ / |
|
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 |
* | | Teach git diff about Objective-C syntax | Jonathan del Strother | 2008-10-06 |
* | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-06 |
|\ \
| |/ |
|
| * | fix bogus "diff --git" header from "diff --no-index" | Linus Torvalds | 2008-10-06 |