summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Use correct grammar in diffstat summary linend/diffstat-gramnumNguyễn Thái Ngọc Duy2012-02-031-1/+2
* Merge branch 'bc/maint-apply-check-no-patch'Junio C Hamano2011-12-131-5/+5
|\
| * builtin/apply.c: report error on failure to recognize inputbc/maint-apply-check-no-patchBrandon Casey2011-12-051-5/+5
| * Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano2011-10-211-2/+9
| * Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano2011-10-211-0/+3
| |\
* | \ Merge branch 'ab/clang-lints'Junio C Hamano2011-12-051-3/+0
|\ \ \
| * | | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
| |/ /
* | | Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano2011-10-191-0/+3
|\ \ \ | | |/ | |/|
| * | fix "git apply --index ..." not to deref NULLJim Meyering2011-10-121-0/+3
* | | Merge branch 'jc/apply-blank-at-eof-fix'Junio C Hamano2011-10-131-2/+9
* | | apply: use OPT_NOOP_NOARGjc/parse-options-booleanRené Scharfe2011-09-281-7/+2
| |/ |/|
* | zlib: zlib can only process 4GB at a timeJunio C Hamano2011-06-101-1/+1
* | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-3/+6
|\ \
| * | "add -p": work-around an old laziness that does not coalesce hunksJunio C Hamano2011-04-291-3/+6
* | | Merge branch 'jc/maint-apply-report-offset'Junio C Hamano2011-03-151-2/+14
|\ \ \ | |/ / |/| |
| * | apply -v: show offset count when patch did not apply exactlyJunio C Hamano2011-03-061-2/+14
| |/
* | apply: do not patch lines that were already patchedJunio C Hamano2011-03-041-1/+6
|/
* Merge branch 'fc/apply-p2-get-header-name'Junio C Hamano2010-11-291-14/+14
|\
| * Fix git-apply with -p greater than 1Federico Cuello2010-11-051-14/+14
* | Merge branch 'ak/apply-non-git-epoch'Junio C Hamano2010-11-291-6/+29
|\ \
| * | apply: handle patches with funny filename and colon in timezoneJonathan Nieder2010-11-101-2/+22
| * | apply: Recognize epoch timestamps with : in the timezoneAnders Kaseorg2010-10-131-4/+7
| |/
* | Merge branch 'rs/opt-help-text'Junio C Hamano2010-11-241-1/+1
|\ \
| * | add description parameter to OPT__VERBOSERené Scharfe2010-11-151-1/+1
| |/
* | apply: don't segfault on binary files with missing dataJeff King2010-10-291-0/+6
|/
* Merge branch 'jn/apply-filename-with-sp'Junio C Hamano2010-09-031-38/+211
|\
| * apply: handle traditional patches with space in filenameJonathan Nieder2010-08-211-14/+179
| * apply: split quoted filename handling into new functionJonathan Nieder2010-08-211-30/+38
* | Merge branch 'jn/paginate-fix'Junio C Hamano2010-08-311-3/+3
|\ \
| * | apply: run setup_git_directory_gently() soonerNguyễn Thái Ngọc Duy2010-08-151-3/+3
| |/
* | Teach "apply --index-info" to handle rename patchesJunio C Hamano2010-07-231-2/+1
|/
* Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-5/+5
|\
| * string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-1/+1
| * string_list: Fix argument order for string_list_lookupJulian Phillips2010-06-271-1/+1
| * string_list: Fix argument order for string_list_insertJulian Phillips2010-06-271-3/+3
* | Merge branch 'gv/portable'Junio C Hamano2010-06-211-2/+2
|\ \ | |/ |/|
| * enums: omit trailing comma for portabilityGary V. Vaughan2010-05-311-2/+2
* | Merge branch 'bg/apply-blank-trailing-context'Junio C Hamano2010-05-081-6/+6
* | Merge branch 'cw/ws-indent-with-tab'Junio C Hamano2010-05-081-42/+39
|\ \
| * | whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dstChris Webb2010-04-041-42/+39
* | | Merge branch 'pc/remove-warn'Junio C Hamano2010-05-081-5/+1
|\ \ \ | |_|/ |/| |
| * | Introduce remove_or_warn functionPeter Collingbourne2010-03-281-5/+1
| |/
* | Merge branch 'maint'Junio C Hamano2010-04-091-4/+1
|/
* Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-201-40/+145
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+3670
View Lorry Controller Status