summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7jk/path-name-safety-2.7Junio C Hamano2016-03-162-21/+6
|\
| * Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6jk/path-name-safety-2.6Junio C Hamano2016-03-162-21/+6
| |\
| | * Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5jk/path-name-safety-2.5Junio C Hamano2016-03-162-21/+6
| | |\
| | | * list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-162-21/+6
| | | * list-objects: drop name_path entirelyJeff King2016-03-162-4/+4
* | | | Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+1
|\ \ \ \
| * | | | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-251-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-101-0/+3
|\ \ \ \
| * | | | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-251-0/+3
* | | | | Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-101-8/+2
|\ \ \ \ \
| * | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-241-8/+2
* | | | | | Merge branch 'jk/tighten-alloc' into maintJunio C Hamano2016-03-1021-101/+63
|\ \ \ \ \ \
| * | | | | | fetch-pack: simplify add_sought_entryJeff King2016-02-221-18/+9
| * | | | | | use st_add and st_mult for allocation size computationJeff King2016-02-227-9/+9
| * | | | | | convert trivial cases to FLEX_ARRAY macrosJeff King2016-02-224-18/+11
| * | | | | | use xmallocz to avoid size arithmeticJeff King2016-02-223-3/+3
| * | | | | | convert trivial cases to ALLOC_ARRAYJeff King2016-02-229-14/+16
| * | | | | | convert manual allocations to argv_arrayJeff King2016-02-223-35/+13
| * | | | | | reflog_expire_cfg: NUL-terminate pattern fieldJeff King2016-02-191-5/+3
* | | | | | | Merge branch 'jc/am-i-v-fix' into maintJunio C Hamano2016-03-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
* | | | | | | | Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-101-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fixNguyễn Thái Ngọc Duy2016-02-121-1/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-101-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-101-1/+2
| * | | | | | | | checkout: reorder check_filename conditionalJeff King2016-02-101-1/+1
* | | | | | | | | Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-105-65/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | config: rename git_config_set_or_die to git_config_setps/config-errorPatrick Steinhardt2016-02-225-35/+35
| * | | | | | | | config: rename git_config_set to git_config_set_gentlyPatrick Steinhardt2016-02-223-16/+16
| * | | | | | | | init-db: die on config errors when initializing empty repoPatrick Steinhardt2016-02-221-10/+10
| * | | | | | | | clone: die on config error in cmd_clonePatrick Steinhardt2016-02-221-4/+4
| * | | | | | | | remote: die on config error when manipulating remotesPatrick Steinhardt2016-02-221-27/+12
| * | | | | | | | remote: die on config error when setting/adding branchesPatrick Steinhardt2016-02-221-17/+9
| * | | | | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-221-5/+6
| * | | | | | | | submodule--helper: die on config error when cloning modulePatrick Steinhardt2016-02-221-2/+2
| * | | | | | | | branch: die on config error when editing branch descriptionPatrick Steinhardt2016-02-221-3/+2
| * | | | | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-221-2/+2
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/ita-cleanup' into maintJunio C Hamano2016-02-223-7/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | grep: make it clear i-t-a entries are ignoredNguyễn Thái Ngọc Duy2015-12-281-1/+1
| * | | | | | | | add and use a convenience macro ce_intent_to_add()Nguyễn Thái Ngọc Duy2015-09-061-1/+1
| * | | | | | | | blame: remove obsolete commentNguyễn Thái Ngọc Duy2015-08-251-5/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | stripspace: call U+0020 a "space" instead of a "blank"ah/stripspace-optstringAlex Henrie2016-01-291-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-051-25/+1
|\ \ \ \ \ \ \
| * | | | | | | clean: make is_git_repository a public functionJeff King2016-01-251-25/+1
| |/ / / / / /
* | | | | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-052-2/+2
|\ \ \ \ \ \ \
| * | | | | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-1/+1
| * | | | | | | diff-no-index: do not take a redundant prefix argumentNguyễn Thái Ngọc Duy2016-01-211-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-261-2/+2
| | |/ / / / / | |/| | | | |