summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)Author
2008-02-25Merge branch 'jc/apply-whitespace'Junio C Hamano
2008-02-24ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano
2008-02-17Merge branch 'sp/safecrlf'Junio C Hamano
2008-02-12Merge branch 'lt/in-core-index'Junio C Hamano
2008-02-11apply: do not barf on patch with too large an offsetJunio C Hamano
2008-02-11builtin-apply.c: guard config parser from value=NULLJunio C Hamano
2008-02-06safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska
2008-02-05core.whitespace: cr-at-eolJunio C Hamano
2008-02-05git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano
2008-02-05builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano
2008-02-05builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano
2008-02-05builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano
2008-02-05builtin-apply.c: simplify calling site to apply_line()Junio C Hamano
2008-02-05builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano
2008-02-05builtin-apply.c: mark common context lines in lineinfo structure.Junio C Hamano
2008-02-05builtin-apply.c: optimize match_beginning/end processing a bit.Junio C Hamano
2008-02-05builtin-apply.c: make it more line orientedJunio C Hamano
2008-02-05builtin-apply.c: push match-beginning/end logic downJunio C Hamano
2008-02-05builtin-apply.c: restructure "offset" matchingJunio C Hamano
2008-02-05builtin-apply.c: refactor small part that matches contextJunio C Hamano
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds
2008-01-16Improve use of lockfile APIBrandon Casey
2008-01-09"git-apply --check" should not report "fixed"Junio C Hamano
2007-12-16builtin-apply: stronger indent-with-on-tab fixingJ. Bruce Fields
2007-12-16builtin-apply: minor cleanup of whitespace detectionJ. Bruce Fields
2007-12-14Make "diff --check" output match "git apply"Wincent Colaiuta
2007-12-14Unify whitespace checkingWincent Colaiuta
2007-12-09Merge branch 'jc/spht'Junio C Hamano
2007-12-06Use gitattributes to define per-path whitespace ruleJunio C Hamano
2007-11-25core.whitespace: documentation updates.Junio C Hamano
2007-11-25builtin-apply: teach whitespace_rulesJunio C Hamano
2007-11-23builtin-apply: rename "whitespace" variables and fix stylesJunio C Hamano
2007-11-16Remove unreachable statementsGuido Ostkamp
2007-11-14Merge branch 'jc/maint-add-sync-stat'Junio C Hamano
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano
2007-10-22Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe
2007-10-04builtin-apply: fix conversion error in strbuf seriesJunio C Hamano
2007-10-03Merge branch 'ph/strbuf'Junio C Hamano
2007-09-30Make read_patch_file work on a strbuf.Pierre Habouzit
2007-09-30strbuf_read_file enhancement, and use it.Pierre Habouzit
2007-09-29strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin
2007-09-21Full rework of quote_c_style and write_name_quoted.Pierre Habouzit
2007-09-21Rework unquote_c_style to work on a strbuf.Pierre Habouzit
2007-09-19builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.Junio C Hamano
2007-09-19Use xmemdupz() in many places.Pierre Habouzit
2007-09-19Merge branch 'master' into ph/strbufJunio C Hamano
2007-09-19apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin
2007-09-19Merge branch 'maint'Junio C Hamano
2007-09-18Fix lapsus in builtin-apply.cPierre Habouzit