summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/apply-whitespace'Junio C Hamano2008-02-241-243/+476
|\
| * ws_fix_copy(): move the whitespace fixing function to ws.cJunio C Hamano2008-02-231-108/+3
| * apply: do not barf on patch with too large an offsetJunio C Hamano2008-02-111-0/+3
| * core.whitespace: cr-at-eolJunio C Hamano2008-02-051-4/+14
| * git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runJunio C Hamano2008-02-051-5/+128
| * builtin-apply.c: pass ws_rule down to match_fragment()Junio C Hamano2008-02-051-3/+5
| * builtin-apply.c: move copy_wsfix() function a bit higher.Junio C Hamano2008-02-051-94/+94
| * builtin-apply.c: do not feed copy_wsfix() leading '+'Junio C Hamano2008-02-051-20/+18
| * builtin-apply.c: simplify calling site to apply_line()Junio C Hamano2008-02-051-18/+20
| * builtin-apply.c: clean-up apply_one_fragment()Junio C Hamano2008-02-051-28/+27
| * builtin-apply.c: mark common context lines in lineinfo structure.Junio C Hamano2008-02-051-25/+32
| * builtin-apply.c: optimize match_beginning/end processing a bit.Junio C Hamano2008-02-051-0/+10
| * builtin-apply.c: make it more line orientedJunio C Hamano2008-02-051-123/+280
| * builtin-apply.c: push match-beginning/end logic downJunio C Hamano2008-02-051-14/+32
| * builtin-apply.c: restructure "offset" matchingJunio C Hamano2008-02-051-24/+25
| * builtin-apply.c: refactor small part that matches contextJunio C Hamano2008-02-051-5/+13
* | Merge branch 'sp/safecrlf'Junio C Hamano2008-02-161-1/+1
|\ \
| * | safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-061-1/+1
| |/
* | Merge branch 'lt/in-core-index'Junio C Hamano2008-02-111-5/+5
|\ \
| * | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-5/+5
| |/
* | builtin-apply.c: guard config parser from value=NULLJunio C Hamano2008-02-111-0/+2
|/
* Improve use of lockfile APIBrandon Casey2008-01-161-1/+1
* "git-apply --check" should not report "fixed"Junio C Hamano2008-01-081-1/+1
* builtin-apply: stronger indent-with-on-tab fixingJ. Bruce Fields2007-12-161-2/+1
* builtin-apply: minor cleanup of whitespace detectionJ. Bruce Fields2007-12-161-4/+4
* Make "diff --check" output match "git apply"Wincent Colaiuta2007-12-131-2/+2
* Unify whitespace checkingWincent Colaiuta2007-12-131-44/+10
* Merge branch 'jc/spht'Junio C Hamano2007-12-091-83/+155
|\
| * Use gitattributes to define per-path whitespace ruleJunio C Hamano2007-12-061-14/+22
| * core.whitespace: documentation updates.Junio C Hamano2007-11-241-1/+1
| * builtin-apply: teach whitespace_rulesJunio C Hamano2007-11-241-19/+49
| * builtin-apply: rename "whitespace" variables and fix stylesJunio C Hamano2007-11-231-57/+91
* | Remove unreachable statementsGuido Ostkamp2007-11-151-1/+0
* | Merge branch 'jc/maint-add-sync-stat'Junio C Hamano2007-11-141-1/+1
|\ \ | |/ |/|
| * ce_match_stat, run_diff_files: use symbolic constants for readabilityJunio C Hamano2007-11-101-1/+1
| * apply: get rid of --index-info in favor of --build-fake-ancestorJohannes Schindelin2007-09-261-13/+22
* | Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsRené Scharfe2007-10-221-1/+1
* | builtin-apply: fix conversion error in strbuf seriesJunio C Hamano2007-10-031-1/+1
* | Merge branch 'ph/strbuf'Junio C Hamano2007-10-031-302/+183
|\ \
| * | Make read_patch_file work on a strbuf.Pierre Habouzit2007-09-291-16/+11
| * | strbuf_read_file enhancement, and use it.Pierre Habouzit2007-09-291-10/+2
| * | strbuf change: be sure ->buf is never ever NULL.Pierre Habouzit2007-09-291-9/+7
| * | Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-201-47/+30
| * | Rework unquote_c_style to work on a strbuf.Pierre Habouzit2007-09-201-61/+62
| * | builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.Junio C Hamano2007-09-191-0/+1
| * | Use xmemdupz() in many places.Pierre Habouzit2007-09-181-9/+2
| * | Merge branch 'master' into ph/strbufJunio C Hamano2007-09-181-8/+35
| |\ \
| * | | builtin-apply: use strbuf's instead of buffer_desc's.Pierre Habouzit2007-09-161-140/+72
| * | | Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
| * | | Rewrite convert_to_{git,working_tree} to use strbuf's.Pierre Habouzit2007-09-161-14/+13
View Lorry Controller Status