summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-08-03submodule: remove gitmodules_configLibravatar Brandon Williams16-53/+0
2017-08-03unpack-trees: improve loading of .gitmodulesLibravatar Brandon Williams1-16/+27
2017-08-03submodule-config: lazy-load a repository's .gitmodules fileLibravatar Brandon Williams2-10/+22
2017-08-03submodule-config: move submodule-config functions to submodule-config.cLibravatar Brandon Williams5-49/+34
2017-08-03submodule-config: remove support for overlaying repository configLibravatar Brandon Williams3-79/+0
2017-08-03diff: stop allowing diff to have submodules configured in .git/configLibravatar Brandon Williams2-70/+0
2017-08-03submodule: remove submodule_config callback routineLibravatar Brandon Williams3-25/+2
2017-08-03unpack-trees: don't respect submodule.updateLibravatar Brandon Williams3-32/+9
2017-08-03submodule: don't rely on overlayed config when setting diffoptsLibravatar Brandon Williams1-2/+10
2017-08-03fetch: don't overlay config with submodule-configLibravatar Brandon Williams2-8/+17
2017-08-03submodule--helper: don't overlay config in update-cloneLibravatar Brandon Williams3-16/+46
2017-08-03submodule--helper: don't overlay config in remote_submodule_branchLibravatar Brandon Williams1-4/+11
2017-08-02add, reset: ensure submodules can be added or resetLibravatar Brandon Williams2-0/+2
2017-08-02submodule: don't use submodule_from_nameLibravatar Brandon Williams1-2/+0
2017-08-02t7411: check configuration parsing errorsLibravatar Brandon Williams2-10/+15
2017-08-02Merge branch 'bc/object-id' into bw/submodule-config-cleanupLibravatar Junio C Hamano45-374/+366
2017-08-02Merge branch 'bw/grep-recurse-submodules' into bw/submodule-config-cleanupLibravatar Junio C Hamano20-449/+246
2017-08-02grep: recurse in-process using 'struct repository'Libravatar Brandon Williams7-344/+88
2017-08-02submodule: merge repo_read_gitmodules and gitmodules_configLibravatar Brandon Williams1-20/+17
2017-08-02submodule: check for unmerged .gitmodules outside of config parsingLibravatar Brandon Williams2-24/+24
2017-08-02submodule: check for unstaged .gitmodules outside of config parsingLibravatar Brandon Williams4-18/+20
2017-08-02submodule: remove fetch.recursesubmodules from submodule-config parsingLibravatar Brandon Williams3-15/+14
2017-08-02submodule: remove submodule.fetchjobs from submodule-config parsingLibravatar Brandon Williams6-21/+40
2017-08-02config: add config_from_gitmodulesLibravatar Brandon Williams2-0/+27
2017-08-02cache.h: add GITMODULES_FILE macroLibravatar Brandon Williams3-11/+12
2017-07-24Git 2.14-rc1Libravatar Junio C Hamano1-1/+1
2017-07-24Merge https://github.com/git-l10n/git-poLibravatar Junio C Hamano7-18800/+20664
2017-07-24l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Libravatar Jiang Xin1-10/+60
2017-07-24Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin7-18830/+20644
2017-07-22Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-3103/+3271
2017-07-21Sync with maintLibravatar Junio C Hamano1-0/+10
2017-07-21fixes from 'master' for 2.13.4Libravatar Junio C Hamano2-1/+11
2017-07-21Merge branch 'ew/fd-cloexec-fix' into maintLibravatar Junio C Hamano1-3/+3
2017-07-21Merge branch 'ks/fix-rebase-doc-picture' into maintLibravatar Junio C Hamano1-1/+1
2017-07-21Merge branch 'js/alias-case-sensitivity' into maintLibravatar Junio C Hamano2-1/+8
2017-07-21Merge branch 'bb/unicode-10.0' into maintLibravatar Junio C Hamano1-13/+29
2017-07-21Hopefully the final last-minute fix before -rc1Libravatar Junio C Hamano1-1/+11
2017-07-21Merge branch 'ks/doc-fixes'Libravatar Junio C Hamano2-10/+11
2017-07-21Merge branch 'rj/cygwin-fread-reads-directories'Libravatar Junio C Hamano1-0/+1
2017-07-21Merge branch 'jc/po-pritime-fix'Libravatar Junio C Hamano1-0/+21
2017-07-21config.mak.uname: set FREAD_READS_DIRECTORIES for cygwinLibravatar Ramsay Jones1-0/+1
2017-07-20A few more topics while waiting for the po/PRItime resolutionLibravatar Junio C Hamano1-0/+12
2017-07-20Merge branch 'mt/p4-parse-G-output'Libravatar Junio C Hamano2-31/+166
2017-07-20Merge branch 'ew/fd-cloexec-fix'Libravatar Junio C Hamano1-3/+3
2017-07-20Merge branch 'jk/build-with-asan'Libravatar Junio C Hamano1-1/+6
2017-07-20Merge branch 'jk/test-copy-bytes-fix'Libravatar Junio C Hamano1-0/+1
2017-07-20Merge branch 'js/alias-case-sensitivity'Libravatar Junio C Hamano2-1/+8
2017-07-20l10n: sv.po: Update Swedish translation (3206t0f0u)Libravatar Peter Krefting1-3103/+3271
2017-07-20RelNotes: mention "sha1dc: optionally use sha1collisiondetection as a submodule"Libravatar Ævar Arnfjörð Bjarmason1-0/+5
2017-07-20RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp"Libravatar Ævar Arnfjörð Bjarmason1-0/+3