Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'al/ansi-color' | Junio C Hamano | 2009-03-05 | 1 | -8/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Clean up use of ANSI color sequences | Arjen Laarhoven | 2009-02-13 | 1 | -8/+8 | |
* | | | | | | Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking | Keith Cascio | 2009-03-04 | 1 | -7/+10 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Remove redundant bit clears from diff_setup() | Keith Cascio | 2009-02-13 | 1 | -3/+0 | |
|/ / / / | ||||||
* | | | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed files | Nazri Ramliy | 2009-02-12 | 1 | -4/+4 | |
* | | | | Merge branch 'jc/maint-split-diff-metainfo' | Junio C Hamano | 2009-01-31 | 1 | -66/+80 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me... | Junio C Hamano | 2009-01-27 | 1 | -66/+80 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | diff.c: output correct index lines for a split diff | Junio C Hamano | 2009-01-27 | 1 | -66/+80 | |
| | |/ / | ||||||
* | | | | Merge branch 'jk/signal-cleanup' | Junio C Hamano | 2009-01-31 | 1 | -52/+56 | |
|\ \ \ \ | ||||||
| * | | | | refactor signal handling for cleanup functions | Jeff King | 2009-01-21 | 1 | -1/+1 | |
| * | | | | chain kill signals for cleanup functions | Jeff King | 2009-01-21 | 1 | -2/+3 | |
| * | | | | diff: refactor tempfile cleanup handling | Jeff King | 2009-01-21 | 1 | -52/+55 | |
* | | | | | Merge branch 'js/diff-color-words' | Junio C Hamano | 2009-01-25 | 1 | -70/+155 | |
|\ \ \ \ \ | ||||||
| * | | | | | color-words: Support diff.wordregex config option | Boyd Stephen Smith Jr | 2009-01-21 | 1 | -0/+5 | |
| * | | | | | color-words: make regex configurable via attributes | Thomas Rast | 2009-01-17 | 1 | -0/+10 | |
| * | | | | | color-words: enable REG_NEWLINE to help user | Thomas Rast | 2009-01-17 | 1 | -1/+2 | |
| * | | | | | color-words: take an optional regular expression describing words | Johannes Schindelin | 2009-01-17 | 1 | -9/+55 | |
| * | | | | | color-words: change algorithm to allow for 0-character word boundaries | Johannes Schindelin | 2009-01-17 | 1 | -66/+91 | |
| * | | | | | color-words: refactor word splitting and use ALLOC_GROW() | Johannes Schindelin | 2009-01-17 | 1 | -21/+19 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'js/patience-diff' | Junio C Hamano | 2009-01-23 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Introduce the diff option '--patience' | Johannes Schindelin | 2009-01-07 | 1 | -0/+2 | |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-01-21 | 1 | -1/+3 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | ||||||
| * | | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmpty | Johannes Schindelin | 2009-01-21 | 1 | -1/+3 | |
| |/ / / | ||||||
* | | | | Merge branch 'rs/diff-ihc' | Junio C Hamano | 2009-01-07 | 1 | -0/+4 | |
|\ \ \ \ | ||||||
| * | | | | diff: add option to show context between close hunks | René Scharfe | 2008-12-29 | 1 | -0/+4 | |
| |/ / / | ||||||
* | | | | remove trailing LF in die() messages | Alexander Potashev | 2009-01-05 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fix type-mismatch compiler warning from diff_populate_filespec() | René Scharfe | 2008-12-18 | 1 | -1/+2 | |
* | | | Make 'prepare_temp_file()' ignore st_size for symlinks | Linus Torvalds | 2008-12-17 | 1 | -5/+4 | |
* | | | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()' | Linus Torvalds | 2008-12-17 | 1 | -9/+7 | |
* | | | diff: respect textconv in rewrite diffs | Jeff King | 2008-12-09 | 1 | -12/+36 | |
* | | | diff: fix handling of binary rewrite diffs | Jeff King | 2008-12-09 | 1 | -1/+3 | |
* | | | diff: allow turning on textconv explicitly for plumbing | Jeff King | 2008-12-07 | 1 | -0/+4 | |
* | | | Merge branch 'jk/diff-convfilter' | Junio C Hamano | 2008-11-12 | 1 | -25/+45 | |
|\ \ \ | ||||||
| * | | | only textconv regular files | Jeff King | 2008-10-26 | 1 | -0/+2 | |
| * | | | userdiff: require explicitly allowing textconv | Jeff King | 2008-10-26 | 1 | -15/+11 | |
| * | | | refactor userdiff textconv code | Jeff King | 2008-10-26 | 1 | -13/+35 | |
* | | | | Merge branch 'jk/diff-convfilter-test-fix' | Junio C Hamano | 2008-11-12 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | diff: add missing static declaration | Jeff King | 2008-10-26 | 1 | -1/+1 | |
* | | | | Merge branch 'rs/blame' | Junio C Hamano | 2008-11-08 | 1 | -0/+5 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Always initialize xpparam_t to 0 | Brian Downing | 2008-10-25 | 1 | -0/+5 | |
* | | | | diff: add filter for converting binary to text | Jeff King | 2008-10-18 | 1 | -2/+47 | |
* | | | | diff: introduce diff.<driver>.binary | Jeff King | 2008-10-18 | 1 | -30/+22 | |
* | | | | diff: unify external diff and funcname parsing code | Jeff King | 2008-10-18 | 1 | -224/+27 | |
|/ / / | ||||||
* | | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -10/+5 | |
* | | | Teach git diff about Objective-C syntax | Jonathan del Strother | 2008-10-06 | 1 | -0/+10 | |
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-06 | 1 | -0/+4 | |
|\ \ \ | |/ / | ||||||
| * | | fix bogus "diff --git" header from "diff --no-index" | Linus Torvalds | 2008-10-06 | 1 | -0/+4 | |
* | | | fix openssl headers conflicting with custom SHA1 implementations | Nicolas Pitre | 2008-10-02 | 1 | -6/+6 | |
* | | | diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785 | Brandon Casey | 2008-09-30 | 1 | -2/+0 | |
* | | | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -46/+60 | |
|\ \ \ |