summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)AuthorFilesLines
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
2007-05-20git-apply: Fix removal of new trailing blank lines.Libravatar Junio C Hamano1-33/+15
2007-05-20Teach 'git-apply --whitespace=strip' to remove empty lines at the end of fileLibravatar Marco Costalba1-3/+40
2007-05-15Ensure return value from xread() is always stored into an ssize_tLibravatar Johan Herland1-2/+2
2007-05-11apply: do not get confused by symlinks in the middleLibravatar Junio C Hamano1-9/+26
2007-04-21Merge branch 'jc/attr'Libravatar Junio C Hamano1-11/+7
2007-04-20Simplify calling of CR/LF conversion routinesLibravatar Alex Riesen1-11/+7
2007-04-18Merge branch 'maint'Libravatar Junio C Hamano1-2/+1
2007-04-18Fix overwriting of files when applying contextually independent diffsLibravatar Alex Riesen1-2/+1
2007-04-07Merge branch 'jc/index-output'Libravatar Junio C Hamano1-3/+3
2007-04-05Merge branch 'maint'Libravatar Junio C Hamano1-2/+2
2007-04-05Rename static variable write_index to update_index in builtin-apply.cLibravatar Junio C Hamano1-6/+6
2007-04-05Honor -p<n> when applying git diffsLibravatar Shawn O. Pearce1-2/+2
2007-04-03_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Libravatar Junio C Hamano1-3/+3
2007-03-22git-apply: Do not free the wrong buffer when we convert the data for writeoutLibravatar Junio C Hamano1-7/+10
2007-03-07Cast 64 bit off_t to 32 bit size_tLibravatar Shawn O. Pearce1-1/+1
2007-03-02Add core.symlinks to mark filesystems that do not support symbolic links.Libravatar Johannes Sixt1-1/+1
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-4/+4
2007-02-27Merge branch 'maint'Libravatar Junio C Hamano1-1/+2
2007-02-27git-apply: do not fix whitespaces on context lines.Libravatar Junio C Hamano1-1/+2
2007-02-24Merge branch 'js/apply'Libravatar Junio C Hamano1-1/+6
2007-02-22Merge branches 'lt/crlf' and 'jc/apply-config'Libravatar Junio C Hamano1-22/+133