aboutsummaryrefslogtreecommitdiff
path: root/builtin/apply.c
Commit message (Expand)AuthorAge
* Merge branch 'jk/misc-fixes-maint'Junio C Hamano2014-07-28
|\
| * apply: avoid possible bogus pointerJeff King2014-07-24
* | Merge branch 'maint'Junio C Hamano2014-07-21
|\ \
| * | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-21
| * | Merge branch 'jc/apply-ignore-whitespace' into maintJunio C Hamano2014-06-25
| |\ \ | | |/ | |/|
* | | Merge branch 'nd/split-index'Junio C Hamano2014-07-16
|\ \ \
| * | | entry.c: update cache_changed if refresh_cache is set in checkout_entry()Nguyễn Thái Ngọc Duy2014-06-13
| * | | read-cache: new API write_locked_index instead of write_index/write_cacheNguyễn Thái Ngọc Duy2014-06-13
| |/ /
* | | Merge branch 'jk/xstrfmt'Junio C Hamano2014-07-09
|\ \ \
| * | | use xstrfmt to replace xmalloc + strcpy/strcatJeff King2014-06-19
* | | | apply: use skip_prefix instead of raw additionJeff King2014-06-20
|/ / /
* | | Merge branch 'jc/apply-ignore-whitespace'Junio C Hamano2014-06-03
|\ \ \ | |/ / |/| / | |/
| * apply --ignore-space-change: lines with and without leading whitespaces do no...Junio C Hamano2014-03-26
* | Merge branch 'jl/nor-or-nand-and'Junio C Hamano2014-04-08
|\ \
| * | comments: fix misuses of "nor"Justin Lebar2014-03-31
* | | Merge branch 'nd/no-more-fnmatch'Junio C Hamano2014-03-14
|\ \ \
| * | | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-20
| |/ /
* | | Merge branch 'ep/varscope'Junio C Hamano2014-02-27
|\ \ \ | |/ / |/| |
| * | builtin/apply.c: reduce scope of variablesElia Pinto2014-01-31
| |/
* | replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder2013-12-05
|/
* Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
* Sync with Git 1.8.3.4Junio C Hamano2013-07-22
|\
| * update URL to the marc.info mail archiveOndřej Bílka2013-07-22
* | Merge branch 'nd/const-struct-cache-entry'Junio C Hamano2013-07-22
|\ \
| * | Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy2013-07-09
| * | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-26
| |\ \
* | \ \ Merge branch 'tr/do-not-call-submodules-subprojects'Junio C Hamano2013-07-22
|\ \ \ \ | |_|_|/ |/| | |
| * | | apply, entry: speak of submodules instead of subprojectsThomas Rast2013-07-18
* | | | apply.c::find_name_traditional(): do not initialize len to the line's lengthStefan Beller2013-07-19
* | | | Merge branch 'rs/logical-vs-binary-or' into maintJunio C Hamano2013-07-19
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | use logical OR (||) instead of binary OR (|) in logical contextRené Scharfe2013-06-13
* | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maintJunio C Hamano2013-07-15
|\ \ \ | |/ / |/| / | |/
| * apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-21
* | Sync with 'maint'Junio C Hamano2013-04-12
|\ \
| * | Correct common spelling mistakes in comments and testsStefano Lattarini2013-04-12
* | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-03
|\ \ \ | |/ / |/| |
| * | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-22
* | | Merge branch 'jc/extended-fake-ancestor-for-gitlink'Junio C Hamano2013-02-14
|\ \ \
| * | | apply: verify submodule commit object name betterJunio C Hamano2013-02-05
* | | | Merge branch 'jk/apply-similaritly-parsing'Junio C Hamano2013-02-08
|\ \ \ \
| * | | | builtin/apply: tighten (dis)similarity index parsingJohn Keeping2013-02-03
| * | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-12
| |\ \ \ \
| * \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-11
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'jc/fake-ancestor-with-non-blobs'Junio C Hamano2013-02-05
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | apply: diagnose incomplete submodule object name betterJunio C Hamano2013-01-31
| * | | | | | apply: simplify build_fake_ancestor()Junio C Hamano2013-01-31
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jc/apply-trailing-blank-removal'Junio C Hamano2013-01-06
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | apply.c:update_pre_post_images(): the preimage can be truncatedJunio C Hamano2012-10-12
| | |_|/ / | |/| | |
| * | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-12
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11Junio C Hamano2012-09-11
| |\ \ \ \ | | |_|_|/ | |/| | |