Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/apply-ws-fix-expands-report' | Junio C Hamano | 2015-03-03 | 1 | -0/+3 |
|\ | |||||
| * | apply: detect and mark whitespace errors in context lines when fixing | Junio C Hamano | 2015-01-22 | 1 | -0/+3 |
* | | Merge branch 'jc/apply-beyond-symlink' | Junio C Hamano | 2015-03-03 | 1 | -1/+141 |
|\ \ | |||||
| * | | apply: do not touch a file beyond a symbolic link | Junio C Hamano | 2015-02-10 | 1 | -0/+112 |
| * | | apply: do not read from beyond a symbolic link | Junio C Hamano | 2015-02-10 | 1 | -0/+2 |
| * | | apply: do not read from the filesystem under --index | Junio C Hamano | 2015-02-10 | 1 | -1/+1 |
| * | | apply: reject input that touches outside the working area | Junio C Hamano | 2015-02-10 | 1 | -0/+26 |
* | | | Merge branch 'jc/apply-ws-fix-expands' | Junio C Hamano | 2015-02-17 | 1 | -3/+28 |
|\ \ \ | | |/ | |/| | |||||
| * | | apply: count the size of postimage correctly | Junio C Hamano | 2015-01-22 | 1 | -2/+21 |
| * | | apply: make update_pre_post_images() sanity check the given postlen | Junio C Hamano | 2015-01-22 | 1 | -0/+6 |
| * | | apply.c: typofix | Junio C Hamano | 2015-01-22 | 1 | -1/+1 |
* | | | Merge branch 'ah/usage-strings' | Junio C Hamano | 2015-02-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | standardize usage info string format | Alex Henrie | 2015-01-14 | 1 | -1/+1 |
* | | | | Merge branch 'jk/blame-commit-label' | Junio C Hamano | 2015-02-11 | 1 | -10/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | builtin/apply.c: use xstrdup_or_null instead of null_strdup | Jeff King | 2015-01-13 | 1 | -10/+5 |
* | | | | Merge branch 'mh/simplify-repack-without-refs' | Junio C Hamano | 2014-12-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | sort_string_list(): rename to string_list_sort() | Michael Haggerty | 2014-11-25 | 1 | -1/+1 |
* | | | | | Merge branch 'sv/typofix-apply-error-message' | Junio C Hamano | 2014-12-12 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | apply: fix typo in an error message | Slavomir Vlcek | 2014-11-17 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | use skip_prefix() to avoid more magic numbers | René Scharfe | 2014-10-07 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* / | | | lockfile.h: extract new header file for the functions in lockfile.c | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
|/ / / | |||||
* | | | use REALLOC_ARRAY for changing the allocation size of arrays | René Scharfe | 2014-09-18 | 1 | -1/+1 |
* | | | Merge branch 'ta/config-set-2' | Junio C Hamano | 2014-09-11 | 1 | -7/+5 |
|\ \ \ | |||||
| * | | | builtin/apply.c: replace `git_config()` with `git_config_get_string_const()` | Tanay Abhra | 2014-08-13 | 1 | -7/+5 |
* | | | | Merge branch 'jc/apply-ws-prefix' | Junio C Hamano | 2014-09-09 | 1 | -63/+68 |
|\ \ \ \ | |||||
| * | | | | apply: omit ws check for excluded paths | Junio C Hamano | 2014-08-07 | 1 | -3/+6 |
| * | | | | apply: hoist use_patch() helper for path exclusion up | Junio C Hamano | 2014-08-07 | 1 | -38/+43 |
| * | | | | apply: use the right attribute for paths in non-Git patches | Junio C Hamano | 2014-08-07 | 1 | -22/+19 |
* | | | | | Merge branch 'jk/misc-fixes-maint' | Junio C Hamano | 2014-07-28 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | apply: avoid possible bogus pointer | Jeff King | 2014-07-24 | 1 | -1/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2014-07-21 | 1 | -3/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | use xmemdupz() to allocate copies of strings given by start and length | René Scharfe | 2014-07-21 | 1 | -3/+1 |
| * | | | | Merge branch 'jc/apply-ignore-whitespace' into maint | Junio C Hamano | 2014-06-25 | 1 | -5/+7 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'nd/split-index' | Junio C Hamano | 2014-07-16 | 1 | -8/+9 |
|\ \ \ \ \ | |||||
| * | | | | | entry.c: update cache_changed if refresh_cache is set in checkout_entry() | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -3/+5 |
| * | | | | | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 2014-06-13 | 1 | -5/+4 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/xstrfmt' | Junio C Hamano | 2014-07-09 | 1 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | use xstrfmt to replace xmalloc + strcpy/strcat | Jeff King | 2014-06-20 | 1 | -3/+1 |
* | | | | | | apply: use skip_prefix instead of raw addition | Jeff King | 2014-06-20 | 1 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'jc/apply-ignore-whitespace' | Junio C Hamano | 2014-06-03 | 1 | -5/+7 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | / | apply --ignore-space-change: lines with and without leading whitespaces do no... | Junio C Hamano | 2014-03-26 | 1 | -5/+7 |
| | |/ | |/| | |||||
* | | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | comments: fix misuses of "nor" | Justin Lebar | 2014-04-01 | 1 | -1/+1 |
* | | | Merge branch 'nd/no-more-fnmatch' | Junio C Hamano | 2014-03-14 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | use wildmatch() directly without fnmatch() wrapper | Nguyễn Thái Ngọc Duy | 2014-02-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'ep/varscope' | Junio C Hamano | 2014-02-27 | 1 | -6/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | builtin/apply.c: reduce scope of variables | Elia Pinto | 2014-01-31 | 1 | -6/+6 |
| |/ | |||||
* / | replace {pre,suf}fixcmp() with {starts,ends}_with() | Christian Couder | 2013-12-05 | 1 | -6/+6 |
|/ | |||||
* | Replace deprecated OPT_BOOLEAN by OPT_BOOL | Stefan Beller | 2013-08-05 | 1 | -12/+12 |