summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintLibravatar Junio C Hamano1-2/+9
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintLibravatar Junio C Hamano1-0/+3
2011-10-12fix "git apply --index ..." not to deref NULLLibravatar Jim Meyering1-0/+3
2011-06-10zlib: zlib can only process 4GB at a timeLibravatar Junio C Hamano1-1/+1
2011-05-16Merge branch 'jc/maint-add-p-overlapping-hunks' into maintLibravatar Junio C Hamano1-3/+6
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksLibravatar Junio C Hamano1-3/+6
2011-03-15Merge branch 'jc/maint-apply-report-offset'Libravatar Junio C Hamano1-2/+14
2011-03-06apply -v: show offset count when patch did not apply exactlyLibravatar Junio C Hamano1-2/+14
2011-03-04apply: do not patch lines that were already patchedLibravatar Junio C Hamano1-1/+6
2010-11-29Merge branch 'fc/apply-p2-get-header-name'Libravatar Junio C Hamano1-14/+14
2010-11-29Merge branch 'ak/apply-non-git-epoch'Libravatar Junio C Hamano1-6/+29
2010-11-24Merge branch 'rs/opt-help-text'Libravatar Junio C Hamano1-1/+1
2010-11-15add description parameter to OPT__VERBOSELibravatar René Scharfe1-1/+1
2010-11-10apply: handle patches with funny filename and colon in timezoneLibravatar Jonathan Nieder1-2/+22
2010-11-05Fix git-apply with -p greater than 1Libravatar Federico Cuello1-14/+14
2010-10-29apply: don't segfault on binary files with missing dataLibravatar Jeff King1-0/+6
2010-10-13apply: Recognize epoch timestamps with : in the timezoneLibravatar Anders Kaseorg1-4/+7
2010-09-03Merge branch 'jn/apply-filename-with-sp'Libravatar Junio C Hamano1-38/+211
2010-08-31Merge branch 'jn/paginate-fix'Libravatar Junio C Hamano1-3/+3
2010-08-21apply: handle traditional patches with space in filenameLibravatar Jonathan Nieder1-14/+179
2010-08-21apply: split quoted filename handling into new functionLibravatar Jonathan Nieder1-30/+38
2010-08-15apply: run setup_git_directory_gently() soonerLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2010-07-23Teach "apply --index-info" to handle rename patchesLibravatar Junio C Hamano1-2/+1
2010-06-30Merge branch 'jp/string-list-api-cleanup'Libravatar Junio C Hamano1-5/+5
2010-06-27string_list: Fix argument order for string_list_appendLibravatar Julian Phillips1-1/+1
2010-06-27string_list: Fix argument order for string_list_lookupLibravatar Julian Phillips1-1/+1
2010-06-27string_list: Fix argument order for string_list_insertLibravatar Julian Phillips1-3/+3
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-2/+2
2010-05-31enums: omit trailing comma for portabilityLibravatar Gary V. Vaughan1-2/+2
2010-05-08Merge branch 'bg/apply-blank-trailing-context'Libravatar Junio C Hamano1-6/+6
2010-05-08Merge branch 'cw/ws-indent-with-tab'Libravatar Junio C Hamano1-42/+39
2010-05-08Merge branch 'pc/remove-warn'Libravatar Junio C Hamano1-5/+1
2010-04-09Merge branch 'maint'Libravatar Junio C Hamano1-4/+1
2010-04-04whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstLibravatar Chris Webb1-42/+39
2010-03-28Introduce remove_or_warn functionLibravatar Peter Collingbourne1-5/+1
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Libravatar Junio C Hamano1-40/+145
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+3670