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