Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | Sync with Git 1.8.3.4 | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ | |||||
| * | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 | 1 | -1/+1 |
* | | Merge branch 'nd/const-struct-cache-entry' | Junio C Hamano | 2013-07-22 | 1 | -6/+7 |
|\ \ | |||||
| * | | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -6/+7 |
| * | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' | Junio C Hamano | 2013-06-27 | 1 | -1/+1 |
| |\ \ | |||||
* | \ \ | Merge branch 'tr/do-not-call-submodules-subprojects' | Junio C Hamano | 2013-07-22 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | apply, entry: speak of submodules instead of subprojects | Thomas Rast | 2013-07-18 | 1 | -1/+1 |
* | | | | apply.c::find_name_traditional(): do not initialize len to the line's length | Stefan Beller | 2013-07-19 | 1 | -1/+1 |
* | | | | Merge branch 'rs/logical-vs-binary-or' into maint | Junio C Hamano | 2013-07-19 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | use logical OR (||) instead of binary OR (|) in logical context | René Scharfe | 2013-06-13 | 1 | -1/+1 |
* | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix' into maint | Junio C Hamano | 2013-07-15 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | apply: carefully strdup a possibly-NULL name | Thomas Rast | 2013-06-21 | 1 | -1/+1 |
* | | Sync with 'maint' | Junio C Hamano | 2013-04-12 | 1 | -3/+3 |
|\ \ | |||||
| * | | Correct common spelling mistakes in comments and tests | Stefano Lattarini | 2013-04-12 | 1 | -3/+3 |
* | | | Merge branch 'jc/apply-ws-fix-tab-in-indent' | Junio C Hamano | 2013-04-03 | 1 | -6/+10 |
|\ \ \ | |/ / |/| | | |||||
| * | | apply --whitespace=fix: avoid running over the postimage buffer | Junio C Hamano | 2013-03-22 | 1 | -6/+10 |
* | | | Merge branch 'jc/extended-fake-ancestor-for-gitlink' | Junio C Hamano | 2013-02-14 | 1 | -2/+38 |
|\ \ \ | |||||
| * | | | apply: verify submodule commit object name better | Junio C Hamano | 2013-02-05 | 1 | -2/+38 |
* | | | | Merge branch 'jk/apply-similaritly-parsing' | Junio C Hamano | 2013-02-09 | 1 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | builtin/apply: tighten (dis)similarity index parsing | John Keeping | 2013-02-03 | 1 | -4/+6 |
| * | | | | Merge branch 'maint-1.7.11' into maint | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Sync with 1.7.11.6 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | Merge branch 'jc/fake-ancestor-with-non-blobs' | Junio C Hamano | 2013-02-06 | 1 | -14/+16 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | apply: diagnose incomplete submodule object name better | Junio C Hamano | 2013-02-01 | 1 | -1/+5 |
| * | | | | | | apply: simplify build_fake_ancestor() | Junio C Hamano | 2013-02-01 | 1 | -14/+12 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/apply-trailing-blank-removal' | Junio C Hamano | 2013-01-07 | 1 | -6/+17 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | apply.c:update_pre_post_images(): the preimage can be truncated | Junio C Hamano | 2012-10-13 | 1 | -6/+17 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11 | Junio C Hamano | 2012-09-12 | 1 | -25/+43 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'pg/maint-apply-remove-unused-variable' into maint-1.7.11 | Junio C Hamano | 2012-09-11 | 1 | -1/+0 |
| |\ \ \ \ | | |_|_|/ | |/| | | |