summaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-201-1/+1
| |/ /
* | | Merge branch 'ep/varscope'Junio C Hamano2014-02-271-6/+6
|\ \ \ | |/ / |/| |
| * | builtin/apply.c: reduce scope of variablesElia Pinto2014-01-311-6/+6
| |/
* | replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-withChristian Couder2013-12-051-6/+6
|/
* Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-12/+12
* Sync with Git 1.8.3.4Junio C Hamano2013-07-221-1/+1
|\
| * update URL to the marc.info mail archiveOndřej Bílka2013-07-221-1/+1
* | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-221-6/+7
|\ \
| * | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entryNguyễn Thái Ngọc Duy2013-07-091-6/+7
| * | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-261-1/+1
| |\ \
* | \ \ Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-221-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-181-1/+1
* | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-191-1/+1
* | | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-191-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-131-1/+1
* | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-151-1/+1
|\ \ \ | |/ / |/| / | |/
| * apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-1/+1
* | Sync with 'maint'Junio C Hamano2013-04-121-3/+3
|\ \
| * | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-121-3/+3
* | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-031-6/+10
|\ \ \ | |/ / |/| |
| * | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-221-6/+10
* | | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-141-2/+38
|\ \ \
| * | | apply: verify submodule commit object name betterJunio C Hamano2013-02-051-2/+38
* | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-081-4/+6
|\ \ \ \
| * | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-031-4/+6
| * | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-121-25/+43
| |\ \ \ \
| * \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-111-1/+0
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-051-14/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
View Lorry Controller Status