| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/apply-whitespace' | Junio C Hamano | 2008-02-24 | 1 | -243/+476 |
|\ |
|
| * | ws_fix_copy(): move the whitespace fixing function to ws.c | Junio C Hamano | 2008-02-23 | 1 | -108/+3 |
| * | apply: do not barf on patch with too large an offset | Junio C Hamano | 2008-02-11 | 1 | -0/+3 |
| * | core.whitespace: cr-at-eol | Junio C Hamano | 2008-02-05 | 1 | -4/+14 |
| * | git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run | Junio C Hamano | 2008-02-05 | 1 | -5/+128 |
| * | builtin-apply.c: pass ws_rule down to match_fragment() | Junio C Hamano | 2008-02-05 | 1 | -3/+5 |
| * | builtin-apply.c: move copy_wsfix() function a bit higher. | Junio C Hamano | 2008-02-05 | 1 | -94/+94 |
| * | builtin-apply.c: do not feed copy_wsfix() leading '+' | Junio C Hamano | 2008-02-05 | 1 | -20/+18 |
| * | builtin-apply.c: simplify calling site to apply_line() | Junio C Hamano | 2008-02-05 | 1 | -18/+20 |
| * | builtin-apply.c: clean-up apply_one_fragment() | Junio C Hamano | 2008-02-05 | 1 | -28/+27 |
| * | builtin-apply.c: mark common context lines in lineinfo structure. | Junio C Hamano | 2008-02-05 | 1 | -25/+32 |
| * | builtin-apply.c: optimize match_beginning/end processing a bit. | Junio C Hamano | 2008-02-05 | 1 | -0/+10 |
| * | builtin-apply.c: make it more line oriented | Junio C Hamano | 2008-02-05 | 1 | -123/+280 |
| * | builtin-apply.c: push match-beginning/end logic down | Junio C Hamano | 2008-02-05 | 1 | -14/+32 |
| * | builtin-apply.c: restructure "offset" matching | Junio C Hamano | 2008-02-05 | 1 | -24/+25 |
| * | builtin-apply.c: refactor small part that matches context | Junio C Hamano | 2008-02-05 | 1 | -5/+13 |
* | | Merge branch 'sp/safecrlf' | Junio C Hamano | 2008-02-16 | 1 | -1/+1 |
|\ \ |
|
| * | | safecrlf: Add mechanism to warn about irreversible crlf conversions | Steffen Prohaska | 2008-02-06 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'lt/in-core-index' | Junio C Hamano | 2008-02-11 | 1 | -5/+5 |
|\ \ |
|
| * | | Make on-disk index representation separate from in-core one | Linus Torvalds | 2008-01-21 | 1 | -5/+5 |
| |/ |
|
* | | builtin-apply.c: guard config parser from value=NULL | Junio C Hamano | 2008-02-11 | 1 | -0/+2 |
|/ |
|
* | Improve use of lockfile API | Brandon Casey | 2008-01-16 | 1 | -1/+1 |
* | "git-apply --check" should not report "fixed" | Junio C Hamano | 2008-01-08 | 1 | -1/+1 |
* | builtin-apply: stronger indent-with-on-tab fixing | J. Bruce Fields | 2007-12-16 | 1 | -2/+1 |
* | builtin-apply: minor cleanup of whitespace detection | J. Bruce Fields | 2007-12-16 | 1 | -4/+4 |
* | Make "diff --check" output match "git apply" | Wincent Colaiuta | 2007-12-13 | 1 | -2/+2 |
* | Unify whitespace checking | Wincent Colaiuta | 2007-12-13 | 1 | -44/+10 |
* | Merge branch 'jc/spht' | Junio C Hamano | 2007-12-09 | 1 | -83/+155 |
|\ |
|
| * | Use gitattributes to define per-path whitespace rule | Junio C Hamano | 2007-12-06 | 1 | -14/+22 |
| * | core.whitespace: documentation updates. | Junio C Hamano | 2007-11-24 | 1 | -1/+1 |
| * | builtin-apply: teach whitespace_rules | Junio C Hamano | 2007-11-24 | 1 | -19/+49 |
| * | builtin-apply: rename "whitespace" variables and fix styles | Junio C Hamano | 2007-11-23 | 1 | -57/+91 |
* | | Remove unreachable statements | Guido Ostkamp | 2007-11-15 | 1 | -1/+0 |
* | | Merge branch 'jc/maint-add-sync-stat' | Junio C Hamano | 2007-11-14 | 1 | -1/+1 |
|\ \
| |/
|/| |
|
| * | ce_match_stat, run_diff_files: use symbolic constants for readability | Junio C Hamano | 2007-11-10 | 1 | -1/+1 |
| * | apply: get rid of --index-info in favor of --build-fake-ancestor | Johannes Schindelin | 2007-09-26 | 1 | -13/+22 |
* | | Correct some sizeof(size_t) != sizeof(unsigned long) typing errors | René Scharfe | 2007-10-22 | 1 | -1/+1 |
* | | builtin-apply: fix conversion error in strbuf series | Junio C Hamano | 2007-10-03 | 1 | -1/+1 |
* | | Merge branch 'ph/strbuf' | Junio C Hamano | 2007-10-03 | 1 | -302/+183 |
|\ \ |
|
| * | | Make read_patch_file work on a strbuf. | Pierre Habouzit | 2007-09-29 | 1 | -16/+11 |
| * | | strbuf_read_file enhancement, and use it. | Pierre Habouzit | 2007-09-29 | 1 | -10/+2 |
| * | | strbuf change: be sure ->buf is never ever NULL. | Pierre Habouzit | 2007-09-29 | 1 | -9/+7 |
| * | | Full rework of quote_c_style and write_name_quoted. | Pierre Habouzit | 2007-09-20 | 1 | -47/+30 |
| * | | Rework unquote_c_style to work on a strbuf. | Pierre Habouzit | 2007-09-20 | 1 | -61/+62 |
| * | | builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion. | Junio C Hamano | 2007-09-19 | 1 | -0/+1 |
| * | | Use xmemdupz() in many places. | Pierre Habouzit | 2007-09-18 | 1 | -9/+2 |
| * | | Merge branch 'master' into ph/strbuf | Junio C Hamano | 2007-09-18 | 1 | -8/+35 |
| |\ \ |
|
| * | | | builtin-apply: use strbuf's instead of buffer_desc's. | Pierre Habouzit | 2007-09-16 | 1 | -140/+72 |
| * | | | Now that cache.h needs strbuf.h, remove useless includes. | Pierre Habouzit | 2007-09-16 | 1 | -1/+0 |
| * | | | Rewrite convert_to_{git,working_tree} to use strbuf's. | Pierre Habouzit | 2007-09-16 | 1 | -14/+13 |