summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano2016-03-241-3/+3
|\
| * submodule: fix regression for deinit without submodulesStefan Beller2016-03-221-3/+3
* | Merge branch 'nd/i18n-2.8.0'Junio C Hamano2016-03-042-6/+6
|\ \
| * | builtin/clone.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-5/+5
| * | builtin/checkout.c: mark strings for translationNguyễn Thái Ngọc Duy2016-02-291-1/+1
* | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2016-03-041-0/+1
|\ \ \ | |/ / |/| |
| * | nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-251-0/+1
* | | Merge branch 'js/config-set-in-non-repository'Junio C Hamano2016-02-261-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 'nd/ita-cleanup' into maintJunio C Hamano2016-02-223-7/+2
| |\ \ \
| * \ \ \ Merge branch 'ah/stripspace-optstring' into maintJunio C Hamano2016-02-221-1/+1
| |\ \ \ \
* | \ \ \ \ Merge branch 'mm/push-default-warning'Junio C Hamano2016-02-261-34/+0
|\ \ \ \ \ \
| * | | | | | push: remove "push.default is unset" warning messagemm/push-default-warningMatthieu Moy2016-02-251-34/+0
* | | | | | | Merge branch 'sb/submodule-module-list-fix'Junio C Hamano2016-02-261-8/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-241-8/+2
* | | | | | | Merge branch 'ps/config-error'Junio C Hamano2016-02-265-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 'ls/config-origin'Junio C Hamano2016-02-261-0/+33
|\ \ \ \ \ \ \
| * | | | | | | config: add '--show-origin' option to print the origin of a config valuels/config-originLars Schneider2016-02-221-0/+33
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/tighten-alloc'Junio C Hamano2016-02-2621-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 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-051-25/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-052-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-051-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-054-0/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'js/fopen-harder' into maintJunio C Hamano2016-02-053-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/clang-pedantic' into maintJunio C Hamano2016-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'tg/git-remote'Junio C Hamano2016-02-262-16/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote: use remote_is_configured() for add and renametg/git-remoteThomas Gummerer2016-02-161-5/+2
| * | | | | | | | | | | | remote: actually check if remote exitsThomas Gummerer2016-02-161-2/+2
| * | | | | | | | | | | | remote: simplify remote_is_configured()Thomas Gummerer2016-02-162-9/+8
* | | | | | | | | | | | | Merge branch 'jc/am-i-v-fix'Junio C Hamano2016-02-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am -i: fix "v"iewjc/am-i-v-fixJunio C Hamano2016-02-171-1/+1
* | | | | | | | | | | | | | Merge branch 'nd/worktree-add-B'Junio C Hamano2016-02-241-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | worktree add -B: do the checkout test before update branchnd/worktree-add-BNguyễn Thái Ngọc Duy2016-02-151-1/+10
View Lorry Controller Status