Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cc/apply' | Junio C Hamano | 2016-04-13 | 1 | -15/+15 |
|\ | |||||
| * | builtin/apply: free patch when parse_chunk() fails | Christian Couder | 2016-04-01 | 1 | -1/+3 |
| * | builtin/apply: handle parse_binary() failure | Christian Couder | 2016-04-01 | 1 | -0/+7 |
| * | apply: remove unused call to free() in gitdiff_{old,new}name() | Junio C Hamano | 2016-03-22 | 1 | -6/+0 |
| * | builtin/apply: get rid of useless 'name' variable | Christian Couder | 2016-03-22 | 1 | -8/+5 |
* | | apply: report patch skipping in verbose mode | Nguyễn Thái Ngọc Duy | 2016-03-24 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'jk/tighten-alloc' | Junio C Hamano | 2016-02-26 | 1 | -1/+1 |
|\ | |||||
| * | use st_add and st_mult for allocation size computation | Jeff King | 2016-02-22 | 1 | -1/+1 |
* | | apply, ls-files: simplify "-z" parsing | Jeff King | 2016-02-01 | 1 | -13/+3 |
|/ | |||||
* | apply: convert root string to strbuf | Jeff King | 2015-10-05 | 1 | -16/+10 |
* | replace trivial malloc + sprintf / strcpy calls with xstrfmt | Jeff King | 2015-09-25 | 1 | -4/+1 |
* | Merge branch 'gb/apply-comment-typofix' | Junio C Hamano | 2015-09-14 | 1 | -1/+1 |
* | Merge branch 'jc/apply-reject-noop-hunk' | Junio C Hamano | 2015-06-24 | 1 | -0/+3 |
|\ | |||||
| * | apply: reject a hunk that does not do anything | Junio C Hamano | 2015-06-01 | 1 | -0/+3 |
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2015-05-06 | 1 | -7/+7 |
|\ \ | |||||
| * | | apply: convert threeway_stage to object_id | brian m. carlson | 2015-03-14 | 1 | -7/+7 |
| * | | Merge branch 'jc/apply-ws-fix-expands' into maint | Junio C Hamano | 2015-02-25 | 1 | -3/+28 |
| |\ \ | |||||
| * \ \ | Merge branch 'jk/blame-commit-label' into maint | Junio C Hamano | 2015-02-25 | 1 | -10/+5 |
| |\ \ \ | |||||
* | | | | | builtin/apply.c: fix a memleak | Stefan Beller | 2015-03-23 | 1 | -1/+3 |
* | | | | | 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 |