summaryrefslogtreecommitdiff
path: root/builtin/apply.c
AgeCommit message (Expand)AuthorFilesLines
2015-09-14Merge branch 'gb/apply-comment-typofix'Libravatar Junio C Hamano1-1/+1
2015-06-24Merge branch 'jc/apply-reject-noop-hunk'Libravatar Junio C Hamano1-0/+3
2015-06-01apply: reject a hunk that does not do anythingLibravatar Junio C Hamano1-0/+3
2015-05-05Merge branch 'bc/object-id'Libravatar Junio C Hamano1-7/+7
2015-03-23builtin/apply.c: fix a memleakLibravatar Stefan Beller1-1/+3
2015-03-13apply: convert threeway_stage to object_idLibravatar brian m. carlson1-7/+7
2015-03-03Merge branch 'jc/apply-ws-fix-expands-report'Libravatar Junio C Hamano1-0/+3
2015-03-03Merge branch 'jc/apply-beyond-symlink'Libravatar Junio C Hamano1-1/+141
2015-02-24Merge branch 'jc/apply-ws-fix-expands' into maintLibravatar Junio C Hamano1-3/+28
2015-02-24Merge branch 'jk/blame-commit-label' into maintLibravatar Junio C Hamano1-10/+5
2015-02-17Merge branch 'jc/apply-ws-fix-expands'Libravatar Junio C Hamano1-3/+28
2015-02-11Merge branch 'ah/usage-strings'Libravatar Junio C Hamano1-1/+1
2015-02-11Merge branch 'jk/blame-commit-label'Libravatar Junio C Hamano1-10/+5
2015-02-10apply: do not touch a file beyond a symbolic linkLibravatar Junio C Hamano1-0/+112
2015-02-10apply: do not read from beyond a symbolic linkLibravatar Junio C Hamano1-0/+2
2015-02-10apply: do not read from the filesystem under --indexLibravatar Junio C Hamano1-1/+1
2015-02-10apply: reject input that touches outside the working areaLibravatar Junio C Hamano1-0/+26
2015-01-22apply: detect and mark whitespace errors in context lines when fixingLibravatar Junio C Hamano1-0/+3
2015-01-22apply: count the size of postimage correctlyLibravatar Junio C Hamano1-2/+21
2015-01-22apply: make update_pre_post_images() sanity check the given postlenLibravatar Junio C Hamano1-0/+6
2015-01-22apply.c: typofixLibravatar Junio C Hamano1-1/+1
2015-01-14standardize usage info string formatLibravatar Alex Henrie1-1/+1
2015-01-13builtin/apply.c: use xstrdup_or_null instead of null_strdupLibravatar Jeff King1-10/+5
2014-12-22Merge branch 'mh/simplify-repack-without-refs'Libravatar Junio C Hamano1-1/+1
2014-12-12Merge branch 'sv/typofix-apply-error-message'Libravatar Junio C Hamano1-1/+1
2014-11-25sort_string_list(): rename to string_list_sort()Libravatar Michael Haggerty1-1/+1
2014-11-17apply: fix typo in an error messageLibravatar Slavomir Vlcek1-1/+1
2014-10-14Merge branch 'rs/more-uses-of-skip-prefix'Libravatar Junio C Hamano1-1/+1
2014-10-07use skip_prefix() to avoid more magic numbersLibravatar René Scharfe1-1/+1
2014-10-01lockfile.h: extract new header file for the functions in lockfile.cLibravatar Michael Haggerty1-0/+1
2014-09-18use REALLOC_ARRAY for changing the allocation size of arraysLibravatar René Scharfe1-1/+1
2014-09-11Merge branch 'ta/config-set-2'Libravatar Junio C Hamano1-7/+5
2014-09-09Merge branch 'jc/apply-ws-prefix'Libravatar Junio C Hamano1-63/+68
2014-08-13builtin/apply.c: replace `git_config()` with `git_config_get_string_const()`Libravatar Tanay Abhra1-7/+5
2014-08-07apply: omit ws check for excluded pathsLibravatar Junio C Hamano1-3/+6
2014-08-07apply: hoist use_patch() helper for path exclusion upLibravatar Junio C Hamano1-38/+43
2014-08-07apply: use the right attribute for paths in non-Git patchesLibravatar Junio C Hamano1-22/+19
2014-07-28Merge branch 'jk/misc-fixes-maint'Libravatar Junio C Hamano1-1/+1
2014-07-24apply: avoid possible bogus pointerLibravatar Jeff King1-1/+1
2014-07-21Merge branch 'maint'Libravatar Junio C Hamano1-3/+1
2014-07-21use xmemdupz() to allocate copies of strings given by start and lengthLibravatar René Scharfe1-3/+1
2014-07-16Merge branch 'nd/split-index'Libravatar Junio C Hamano1-8/+9
2014-07-09Merge branch 'jk/xstrfmt'Libravatar Junio C Hamano1-3/+1
2014-06-25Merge branch 'jc/apply-ignore-whitespace' into maintLibravatar Junio C Hamano1-5/+7
2014-06-20apply: use skip_prefix instead of raw additionLibravatar Jeff King1-2/+3
2014-06-19use xstrfmt to replace xmalloc + strcpy/strcatLibravatar Jeff King1-3/+1
2014-06-13entry.c: update cache_changed if refresh_cache is set in checkout_entry()Libravatar Nguyễn Thái Ngọc Duy1-3/+5
2014-06-13read-cache: new API write_locked_index instead of write_index/write_cacheLibravatar Nguyễn Thái Ngọc Duy1-5/+4
2014-06-03Merge branch 'jc/apply-ignore-whitespace'Libravatar Junio C Hamano1-5/+7
2014-04-08Merge branch 'jl/nor-or-nand-and'Libravatar Junio C Hamano1-1/+1