summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)Author
2015-09-14Merge branch 'gb/apply-comment-typofix'Junio C Hamano
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Junio C Hamano
2015-06-01apply: reject a hunk that does not do anythingJunio C Hamano
2015-05-06Merge branch 'bc/object-id'Junio C Hamano
2015-03-23builtin/apply.c: fix a memleakStefan Beller
2015-03-14apply: convert threeway_stage to object_idbrian m. carlson
2015-03-03Merge branch 'jc/apply-ws-fix-expands-report'Junio C Hamano
2015-03-03Merge branch 'jc/apply-beyond-symlink'Junio C Hamano
2015-02-25Merge branch 'jc/apply-ws-fix-expands' into maintJunio C Hamano
2015-02-25Merge branch 'jk/blame-commit-label' into maintJunio C Hamano
2015-02-17Merge branch 'jc/apply-ws-fix-expands'Junio C Hamano
2015-02-11Merge branch 'ah/usage-strings'Junio C Hamano
2015-02-11Merge branch 'jk/blame-commit-label'Junio C Hamano
2015-02-10apply: do not touch a file beyond a symbolic linkJunio C Hamano
2015-02-10apply: do not read from beyond a symbolic linkJunio C Hamano
2015-02-10apply: do not read from the filesystem under --indexJunio C Hamano
2015-02-10apply: reject input that touches outside the working areaJunio C Hamano
2015-01-22apply: detect and mark whitespace errors in context lines when fixingJunio C Hamano
2015-01-22apply: count the size of postimage correctlyJunio C Hamano
2015-01-22apply: make update_pre_post_images() sanity check the given postlenJunio C Hamano
2015-01-22apply.c: typofixJunio C Hamano
2015-01-14standardize usage info string formatAlex Henrie
2015-01-13builtin/apply.c: use xstrdup_or_null instead of null_strdupJeff King
2014-12-22Merge branch 'mh/simplify-repack-without-refs'Junio C Hamano
2014-12-12Merge branch 'sv/typofix-apply-error-message'Junio C Hamano
2014-11-25sort_string_list(): rename to string_list_sort()Michael Haggerty
2014-11-17apply: fix typo in an error messageSlavomir Vlcek
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano
2014-10-07use skip_prefix() to avoid more magic numbersRené Scharfe
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cMichael Haggerty
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysRené Scharfe
2014-09-11Merge branch 'ta/config-set-2'Junio C Hamano
2014-09-09Merge branch 'jc/apply-ws-prefix'Junio C Hamano
2014-08-13builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`Tanay Abhra
2014-08-07apply: omit ws check for excluded pathsJunio C Hamano
2014-08-07apply: hoist use_patch() helper for path exclusion upJunio C Hamano
2014-08-07apply: use the right attribute for paths in non-Git patchesJunio C Hamano
2014-07-28Merge branch 'jk/misc-fixes-maint'Junio C Hamano
2014-07-24apply: avoid possible bogus pointerJeff King
2014-07-21Merge branch 'maint'Junio C Hamano
2014-07-21use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe
2014-07-16Merge branch 'nd/split-index'Junio C Hamano
2014-07-09Merge branch 'jk/xstrfmt'Junio C Hamano
2014-06-25Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano
2014-06-20apply: use skip_prefix instead of raw additionJeff King
2014-06-19use xstrfmt to replace xmalloc + strcpy/strcatJeff King
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy
2014-06-03Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano