summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)Author
2011-05-11Merge branch 'jc/maint-add-p-overlapping-hunks'Junio C Hamano
2011-04-29"add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano
2011-03-15Merge branch 'jc/maint-apply-report-offset'Junio C Hamano
2011-03-06apply -v: show offset count when patch did not apply exactlyJunio C Hamano
2011-03-04apply: do not patch lines that were already patchedJunio C Hamano
2010-11-30Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano
2010-11-30Merge branch 'ak/apply-non-git-epoch'Junio C Hamano
2010-11-24Merge branch 'rs/opt-help-text'Junio C Hamano
2010-11-15add description parameter to OPT__VERBOSERené Scharfe
2010-11-10apply: handle patches with funny filename and colon in timezoneJonathan Nieder
2010-11-05Fix git-apply with -p greater than 1Federico Cuello
2010-10-29apply: don't segfault on binary files with missing dataJeff King
2010-10-13apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg
2010-09-03Merge branch 'jn/apply-filename-with-sp'Junio C Hamano
2010-08-31Merge branch 'jn/paginate-fix'Junio C Hamano
2010-08-22apply: handle traditional patches with space in filenameJonathan Nieder
2010-08-22apply: split quoted filename handling into new functionJonathan Nieder
2010-08-16apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy
2010-07-23Teach "apply --index-info" to handle rename patchesJunio C Hamano
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-06-21Merge branch 'gv/portable'Junio C Hamano
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan
2010-05-09Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano
2010-05-09Merge branch 'cw/ws-indent-with-tab'Junio C Hamano
2010-05-09Merge branch 'pc/remove-warn'Junio C Hamano
2010-04-10Merge branch 'maint'Junio C Hamano
2010-04-04whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb
2010-03-28Introduce remove_or_warn functionPeter Collingbourne
2010-03-20Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds