| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|\ \ |
|
| * \ | Merge branch 'maint' into bc/master-diff-hunk-header-fix | Shawn O. Pearce | 2008-09-29 | 1 | -11/+1 |
| |\ \
| | |/ |
|
| | * | Merge branch 'bc/maint-diff-hunk-header-fix' into maint | Shawn O. Pearce | 2008-09-29 | 1 | -43/+55 |
| | |\ |
|
| | * \ | Merge branch 'jc/maint-diff-quiet' into maint | Junio C Hamano | 2008-09-18 | 1 | -11/+1 |
| | |\ \ |
|
| * | | | | t4018-diff-funcname: test syntax of builtin xfuncname patterns | Brandon Casey | 2008-09-23 | 1 | -1/+1 |
| * | | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-20 | 1 | -1/+3 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | diff hunk pattern: fix misconverted "\{" tex macro introducers | Junio C Hamano | 2008-09-20 | 1 | -2/+2 |
| * | | | | diff: fix "multiple regexp" semantics to find hunk header comment | Junio C Hamano | 2008-09-20 | 1 | -1/+1 |
| * | | | | diff: use extended regexp to find hunk headers | Junio C Hamano | 2008-09-19 | 1 | -3/+3 |
| * | | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-19 | 1 | -14/+17 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | diff: use extended regexp to find hunk headers | Junio C Hamano | 2008-09-19 | 1 | -14/+17 |
| * | | | | Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix | Junio C Hamano | 2008-09-18 | 1 | -39/+55 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | diff.*.xfuncname which uses "extended" regex's for hunk header selection | Brandon Casey | 2008-09-18 | 1 | -0/+5 |
| | * | | | diff.c: associate a flag with each pattern and use it for compiling regex | Brandon Casey | 2008-09-18 | 1 | -9/+12 |
| | * | | | diff.c: return pattern entry pointer rather than just the hunk header pattern | Brandon Casey | 2008-09-18 | 1 | -27/+28 |
| | |/ / |
|
| | * | | Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint | Junio C Hamano | 2008-09-10 | 1 | -1/+8 |
| | |\ \ |
|
* | | \ \ | Merge branch 'ho/dirstat-by-file' | Shawn O. Pearce | 2008-09-25 | 1 | -1/+9 |
|\ \ \ \ \ |
|
| * | | | | | diff --dirstat-by-file: count changed files, not lines | Heikki Orsila | 2008-09-05 | 1 | -1/+9 |
* | | | | | | Merge branch 'jc/diff-prefix' | Junio C Hamano | 2008-09-18 | 1 | -6/+40 |
|\ \ \ \ \ \ |
|
| * | | | | | | diff: vary default prefix depending on what are compared | Junio C Hamano | 2008-08-30 | 1 | -6/+40 |
* | | | | | | | Merge branch 'jc/maint-diff-quiet' | Junio C Hamano | 2008-09-16 | 1 | -11/+1 |
|\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| * | | | | | | diff --quiet: make it synonym to --exit-code >/dev/null | Junio C Hamano | 2008-09-06 | 1 | -10/+0 |
| * | | | | | | diff Porcelain: do not disable auto index refreshing on -C -C | Junio C Hamano | 2008-09-06 | 1 | -1/+1 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | Merge branch 'jc/hide-cr-in-diff-from-less' | Junio C Hamano | 2008-09-07 | 1 | -1/+8 |
|\ \ \ \ \ \
| |_|_|_|/ /
|/| | | | /
| | |_|_|/
| |/| | | |
|