summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/startup-info'Junio C Hamano2016-04-032-2/+5
|\
| * grep: turn off gitlink detection for --no-indexJeff King2016-03-071-2/+4
| * setup: set startup_info->have_repository more reliablyJeff King2016-03-061-0/+1
* | Merge branch 'jc/index-pack'Junio C Hamano2016-04-031-18/+17
|\ \
| * | index-pack: add a helper function to derive .idx/.keep filenamejc/index-packJunio C Hamano2016-03-031-18/+17
| * | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-031-1/+1
| |\ \
* | \ \ Merge branch 'gf/fetch-pack-direct-object-fetch'Junio C Hamano2016-04-031-3/+13
|\ \ \ \
| * | | | fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-011-3/+13
| |/ / /
* | | | Merge branch 'jc/maint-index-pack-keep'Junio C Hamano2016-04-031-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | index-pack: correct --keep[=<msg>]jc/maint-index-pack-keepJunio C Hamano2016-03-031-1/+1
* | | | Merge branch 'jk/rev-parse-local-env-vars'Junio C Hamano2016-04-031-18/+32
|\ \ \ \
| * | | | rev-parse: let some options run outside repositoryjk/rev-parse-local-env-varsJeff King2016-02-291-18/+32
* | | | | Merge branch 'jk/config-get-urlmatch'Junio C Hamano2016-04-031-1/+4
|\ \ \ \ \
| * | | | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-281-1/+4
| |/ / / /
* | | | | Merge branch 'mm/diff-renames-default'Junio C Hamano2016-04-034-5/+14
|\ \ \ \ \
| * | | | | diff: activate diff.renames by defaultmm/diff-renames-defaultMatthieu Moy2016-02-254-0/+4
| * | | | | log: introduce init_log_defaults()Matthieu Moy2016-02-251-5/+10
* | | | | | 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
View Lorry Controller Status