summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff-tree: read the index so attribute checks work in bare repositoriesbw/submodule-config-cleanupBrandon Williams2017-12-062-0/+19
* submodule: remove gitmodules_configBrandon Williams2017-08-0316-53/+0
* unpack-trees: improve loading of .gitmodulesBrandon Williams2017-08-031-16/+27
* submodule-config: lazy-load a repository's .gitmodules fileBrandon Williams2017-08-032-10/+22
* submodule-config: move submodule-config functions to submodule-config.cBrandon Williams2017-08-035-49/+34
* submodule-config: remove support for overlaying repository configBrandon Williams2017-08-033-79/+0
* diff: stop allowing diff to have submodules configured in .git/configBrandon Williams2017-08-032-70/+0
* submodule: remove submodule_config callback routineBrandon Williams2017-08-033-25/+2
* unpack-trees: don't respect submodule.updateBrandon Williams2017-08-033-32/+9
* submodule: don't rely on overlayed config when setting diffoptsBrandon Williams2017-08-031-2/+10
* fetch: don't overlay config with submodule-configBrandon Williams2017-08-032-8/+17
* submodule--helper: don't overlay config in update-cloneBrandon Williams2017-08-033-16/+46
* submodule--helper: don't overlay config in remote_submodule_branchBrandon Williams2017-08-031-4/+11
* add, reset: ensure submodules can be added or resetBrandon Williams2017-08-022-0/+2
* submodule: don't use submodule_from_nameBrandon Williams2017-08-021-2/+0
* t7411: check configuration parsing errorsBrandon Williams2017-08-022-10/+15
* Merge branch 'bc/object-id' into bw/submodule-config-cleanupJunio C Hamano2017-08-0245-374/+366
|\
| * sha1_name: convert uses of 40 to GIT_SHA1_HEXSZbrian m. carlson2017-07-171-3/+3
| * sha1_name: convert GET_SHA1* flags to GET_OID*brian m. carlson2017-07-178-56/+56
| * sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-1720-153/+144
| * Convert remaining callers of get_sha1 to get_oid.brian m. carlson2017-07-172-5/+5
| * builtin/unpack-file: convert to struct object_idbrian m. carlson2017-07-171-6/+6
| * bisect: convert bisect_checkout to struct object_idbrian m. carlson2017-07-171-9/+9
| * builtin/update_ref: convert to struct object_idbrian m. carlson2017-07-171-35/+34
| * sequencer: convert to struct object_idbrian m. carlson2017-07-171-29/+30
| * remote: convert struct push_cas to struct object_idbrian m. carlson2017-07-172-4/+4
| * submodule: convert submodule config lookup to use object_idbrian m. carlson2017-07-1710-62/+62
| * builtin/merge-tree: convert remaining caller of get_sha1 to object_idbrian m. carlson2017-07-171-3/+3
| * builtin/fsck: convert remaining caller of get_sha1 to object_idbrian m. carlson2017-07-171-4/+4
| * tag: convert gpg_verify_tag to use struct object_idsb/object-idStefan Beller2017-07-134-11/+12
| * commit: convert lookup_commit_graft to struct object_idStefan Beller2017-07-134-7/+7
* | Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanupJunio C Hamano2017-08-0220-449/+246
|\ \
| * | grep: recurse in-process using 'struct repository'Brandon Williams2017-08-027-344/+88
| * | submodule: merge repo_read_gitmodules and gitmodules_configBrandon Williams2017-08-021-20/+17
| * | submodule: check for unmerged .gitmodules outside of config parsingBrandon Williams2017-08-022-24/+24
| * | submodule: check for unstaged .gitmodules outside of config parsingBrandon Williams2017-08-024-18/+20
| * | submodule: remove fetch.recursesubmodules from submodule-config parsingBrandon Williams2017-08-023-15/+14
| * | submodule: remove submodule.fetchjobs from submodule-config parsingBrandon Williams2017-08-026-21/+40
| * | config: add config_from_gitmodulesBrandon Williams2017-08-022-0/+27
| * | cache.h: add GITMODULES_FILE macroBrandon Williams2017-08-023-11/+12
| * | repository: have the_repository use the_indexBrandon Williams2017-07-181-1/+3
| * | repo_read_index: don't discard the indexBrandon Williams2017-07-182-2/+8
* | | Git 2.14-rc1v2.14.0-rc1Junio C Hamano2017-07-241-1/+1
* | | Merge https://github.com/git-l10n/git-poJunio C Hamano2017-07-247-18800/+20664
|\ \ \
| * | | l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Jiang Xin2017-07-241-10/+60
| * | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-07-247-18830/+20644
| |\ \ \ |/ / / /
| * | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-07-221-3103/+3271
| |\ \ \
| | * | | l10n: sv.po: Update Swedish translation (3206t0f0u)Peter Krefting2017-07-201-3103/+3271
| * | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-07-191-3228/+3585
| |/ / /
| * | | l10n: Update Catalan translationJordi Mas2017-07-181-1071/+602
View Lorry Controller Status