summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/object-id'Junio C Hamano2015-05-051-7/+7
|\
| * apply: convert threeway_stage to object_idbrian m. carlson2015-03-131-7/+7
| * Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano2015-02-241-3/+28
| |\
| * \ Merge branch 'jk/blame-commit-label' into maintJunio C Hamano2015-02-241-10/+5
| |\ \
* | | | builtin/apply.c: fix a memleakStefan Beller2015-03-231-1/+3
* | | | Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano2015-03-031-0/+3
|\ \ \ \
| * | | | apply: detect and mark whitespace errors in context lines when fixingjc/apply-ws-fix-expands-reportJunio C Hamano2015-01-221-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'jc/apply-beyond-symlink'Junio C Hamano2015-03-031-1/+141
|\ \ \ \
| * | | | apply: do not touch a file beyond a symbolic linkjc/apply-beyond-symlinkJunio C Hamano2015-02-101-0/+112
| * | | | apply: do not read from beyond a symbolic linkJunio C Hamano2015-02-101-0/+2
| * | | | apply: do not read from the filesystem under --indexJunio C Hamano2015-02-101-1/+1
| * | | | apply: reject input that touches outside the working areaJunio C Hamano2015-02-101-0/+26
* | | | | Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano2015-02-171-3/+28
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | apply: count the size of postimage correctlyjc/apply-ws-fix-expandsJunio C Hamano2015-01-221-2/+21
| * | | | apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano2015-01-221-0/+6
| * | | | apply.c: typofixJunio C Hamano2015-01-221-1/+1
* | | | | Merge branch 'ah/usage-strings'Junio C Hamano2015-02-111-1/+1
|\ \ \ \ \
| * | | | | standardize usage info string formatAlex Henrie2015-01-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jk/blame-commit-label'Junio C Hamano2015-02-111-10/+5
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King2015-01-131-10/+5
* | | | Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano2014-12-221-1/+1
|\ \ \ \
| * | | | sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refsMichael Haggerty2014-11-251-1/+1
* | | | | Merge branch 'sv/typofix-apply-error-message'Junio C Hamano2014-12-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | apply: fix typo in an error messagesv/typofix-apply-error-messageSlavomir Vlcek2014-11-171-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-141-1/+1
|\ \ \ \
| * | | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-071-1/+1
| | |/ / | |/| |
* | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-011-0/+1
|/ / /
* | | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-arrayRené Scharfe2014-09-181-1/+1
* | | Merge branch 'ta/config-set-2'Junio C Hamano2014-09-111-7/+5
|\ \ \
| * | | builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`ta/config-set-2Tanay Abhra2014-08-131-7/+5
* | | | Merge branch 'jc/apply-ws-prefix'Junio C Hamano2014-09-091-63/+68
|\ \ \ \
| * | | | apply: omit ws check for excluded pathsjc/apply-ws-prefixJunio C Hamano2014-08-071-3/+6
| * | | | apply: hoist use_patch() helper for path exclusion upJunio C Hamano2014-08-071-38/+43
| * | | | apply: use the right attribute for paths in non-Git patchesJunio C Hamano2014-08-071-22/+19
* | | | | Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-281-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | apply: avoid possible bogus pointerjk/misc-fixes-maintJeff King2014-07-241-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2014-07-211-3/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-211-3/+1
| * | | | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-251-5/+7
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'nd/split-index'Junio C Hamano2014-07-161-8/+9
|\ \ \ \ \
| * | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-131-3/+5
| * | | | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-131-5/+4
| |/ / / /
* | | | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-091-3/+1
|\ \ \ \ \
| * | | | | use xstrfmt to replace xmalloc + strcpy/strcatJeff King2014-06-191-3/+1
* | | | | | apply: use skip_prefix instead of raw additionJeff King2014-06-201-2/+3
|/ / / / /
* | | | | Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano2014-06-031-5/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | apply --ignore-space-change: lines with and without leading whitespaces do no...jc/apply-ignore-whitespaceJunio C Hamano2014-03-261-5/+7
| | |/ | |/|
* | | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-081-1/+1
|\ \ \ | | |/ | |/|
| * | comments: fix misuses of "nor"Justin Lebar2014-03-311-1/+1
* | | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-141-1/+1
|\ \ \
View Lorry Controller Status