| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'rs/more-uses-of-skip-prefix' | Junio C Hamano | 2014-10-14 | 1 | -1/+1 |
|\ |
|
| * | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefix | René Scharfe | 2014-10-07 | 1 | -1/+1 |
* | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfile | Michael Haggerty | 2014-10-01 | 1 | -0/+1 |
|/ |
|
* | use REALLOC_ARRAY for changing the allocation size of arraysrs/realloc-array | 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()`ta/config-set-2 | 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 pathsjc/apply-ws-prefix | 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 pointerjk/misc-fixes-maint | 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-19 | 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...jc/apply-ignore-whitespace | 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-03-31 | 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()cc/starts-n-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 possiblend/const-struct-cache-entry | 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-26 | 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-08 | 1 | -4/+6 |
|\ \ \ \ |
|