summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)AuthorFilesLines
2008-02-16Merge branch 'sp/safecrlf'Libravatar Junio C Hamano1-1/+1
2008-02-11Merge branch 'lt/in-core-index'Libravatar Junio C Hamano1-5/+5
2008-02-11builtin-apply.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
2008-02-06safecrlf: Add mechanism to warn about irreversible crlf conversionsLibravatar Steffen Prohaska1-1/+1
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-5/+5
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-1/+1
2008-01-08"git-apply --check" should not report "fixed"Libravatar Junio C Hamano1-1/+1
2007-12-16builtin-apply: stronger indent-with-on-tab fixingLibravatar J. Bruce Fields1-2/+1
2007-12-16builtin-apply: minor cleanup of whitespace detectionLibravatar J. Bruce Fields1-4/+4
2007-12-13Make "diff --check" output match "git apply"Libravatar Wincent Colaiuta1-2/+2
2007-12-13Unify whitespace checkingLibravatar Wincent Colaiuta1-44/+10
2007-12-09Merge branch 'jc/spht'Libravatar Junio C Hamano1-83/+155
2007-12-06Use gitattributes to define per-path whitespace ruleLibravatar Junio C Hamano1-14/+22
2007-11-24core.whitespace: documentation updates.Libravatar Junio C Hamano1-1/+1
2007-11-24builtin-apply: teach whitespace_rulesLibravatar Junio C Hamano1-19/+49
2007-11-23builtin-apply: rename "whitespace" variables and fix stylesLibravatar Junio C Hamano1-57/+91
2007-11-15Remove unreachable statementsLibravatar Guido Ostkamp1-1/+0
2007-11-14Merge branch 'jc/maint-add-sync-stat'Libravatar Junio C Hamano1-1/+1
2007-11-10ce_match_stat, run_diff_files: use symbolic constants for readabilityLibravatar Junio C Hamano1-1/+1
2007-10-22Correct some sizeof(size_t) != sizeof(unsigned long) typing errorsLibravatar René Scharfe1-1/+1
2007-10-03builtin-apply: fix conversion error in strbuf seriesLibravatar Junio C Hamano1-1/+1
2007-10-03Merge branch 'ph/strbuf'Libravatar Junio C Hamano1-302/+183
2007-09-29Make read_patch_file work on a strbuf.Libravatar Pierre Habouzit1-16/+11
2007-09-29strbuf_read_file enhancement, and use it.Libravatar Pierre Habouzit1-10/+2
2007-09-29strbuf change: be sure ->buf is never ever NULL.Libravatar Pierre Habouzit1-9/+7
2007-09-26apply: get rid of --index-info in favor of --build-fake-ancestorLibravatar Johannes Schindelin1-13/+22
2007-09-20Full rework of quote_c_style and write_name_quoted.Libravatar Pierre Habouzit1-47/+30
2007-09-20Rework unquote_c_style to work on a strbuf.Libravatar Pierre Habouzit1-61/+62
2007-09-19builtin-apply.c: fix a tiny leak introduced during xmemdupz() conversion.Libravatar Junio C Hamano1-0/+1
2007-09-18Use xmemdupz() in many places.Libravatar Pierre Habouzit1-9/+2
2007-09-18Merge branch 'master' into ph/strbufLibravatar Junio C Hamano1-8/+35
2007-09-18apply: get rid of --index-info in favor of --build-fake-ancestorLibravatar Johannes Schindelin1-13/+22
2007-09-18Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-09-18Fix lapsus in builtin-apply.cLibravatar Pierre Habouzit1-1/+1
2007-09-18Merge branch 'cr/reset'Libravatar Junio C Hamano1-2/+0
2007-09-17git-apply: fix whitespace strippingLibravatar J. Bruce Fields1-3/+10
2007-09-16apply --index-info: fall back to current index for mode changesLibravatar Johannes Schindelin1-2/+24
2007-09-16builtin-apply: use strbuf's instead of buffer_desc's.Libravatar Pierre Habouzit1-140/+72
2007-09-16Now that cache.h needs strbuf.h, remove useless includes.Libravatar Pierre Habouzit1-1/+0
2007-09-16Rewrite convert_to_{git,working_tree} to use strbuf's.Libravatar Pierre Habouzit1-14/+13
2007-09-14Simplify cache APILibravatar Junio C Hamano1-2/+0
2007-09-10Strbuf API extensions and fixes.Libravatar Pierre Habouzit1-2/+2
2007-09-06Use strbuf API in apply, blame, commit-tree and diffLibravatar Pierre Habouzit1-21/+9
2007-09-05git-apply: do not read past the end of bufferLibravatar Junio C Hamano1-1/+2
2007-08-15git-apply: apply submodule changesLibravatar Sven Verdoolaege1-25/+86
2007-08-06Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2007-08-06apply: remove directory that becomes empty by renaming the last file awayLibravatar Linus Torvalds1-1/+1
2007-07-07Merge branch 'maint'Libravatar Junio C Hamano1-1/+5
2007-07-07Fix "apply --reverse" with regard to whitespaceLibravatar Johannes Schindelin1-1/+5
2007-06-02git-apply: what is detected and fixed is not just trailing spaces.Libravatar Junio C Hamano1-9/+8