diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-24 17:23:17 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-24 17:23:17 -0800 |
commit | e38f892d1832977511c4e7c82204c7f94c3a3232 (patch) | |
tree | ebbab519e098092d766d8391354995e5bfef6ba2 /alloc.c | |
parent | dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c (diff) | |
parent | fe3403c3205de44faa926a086b4b99f157fc63fe (diff) | |
download | git-e38f892d1832977511c4e7c82204c7f94c3a3232.tar.gz git-e38f892d1832977511c4e7c82204c7f94c3a3232.tar.xz |
Merge branch 'jc/apply-whitespace'
* jc/apply-whitespace:
ws_fix_copy(): move the whitespace fixing function to ws.c
apply: do not barf on patch with too large an offset
core.whitespace: cr-at-eol
git-apply --whitespace=fix: fix whitespace fuzz introduced by previous run
builtin-apply.c: pass ws_rule down to match_fragment()
builtin-apply.c: move copy_wsfix() function a bit higher.
builtin-apply.c: do not feed copy_wsfix() leading '+'
builtin-apply.c: simplify calling site to apply_line()
builtin-apply.c: clean-up apply_one_fragment()
builtin-apply.c: mark common context lines in lineinfo structure.
builtin-apply.c: optimize match_beginning/end processing a bit.
builtin-apply.c: make it more line oriented
builtin-apply.c: push match-beginning/end logic down
builtin-apply.c: restructure "offset" matching
builtin-apply.c: refactor small part that matches context
Diffstat (limited to 'alloc.c')
0 files changed, 0 insertions, 0 deletions