summaryrefslogtreecommitdiff
path: root/git-submodule.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-05-171-2/+3
|\
| * submodule: stop sanitizing config optionsjk/submodule-c-credentialJeff King2016-05-061-2/+2
| * submodule: export sanitized GIT_CONFIG_PARAMETERSJeff King2016-04-281-0/+1
* | Merge branch 'sb/submodule-deinit-all'Junio C Hamano2016-05-171-3/+12
|\ \
| * | submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller2016-05-051-3/+12
* | | Merge branch 'sb/submodule-init'Junio C Hamano2016-05-171-121/+6
|\ \ \
| * | | submodule: port init from shell to CStefan Beller2016-04-161-45/+3
| * | | submodule: port resolve_relative_url from shell to CStefan Beller2016-04-161-77/+4
| * | | Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-initJunio C Hamano2016-04-141-9/+33
| |\ \ \
* | \ \ \ Merge branch 'sb/submodule-path-misc-bugs'Junio C Hamano2016-04-251-6/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | submodule update: align reporting path for custom command executionStefan Beller2016-03-301-2/+2
| * | | | submodule status: correct path handling in recursive submodulesStefan Beller2016-03-301-0/+1
| * | | | submodule update --init: correct path handling in recursive submodulesStefan Beller2016-03-301-1/+1
| * | | | submodule foreach: correct path display in recursive submodulesStefan Beller2016-03-301-3/+3
| | |/ / | |/| |
* | | | Merge branch 'jk/submodule-c-credential'Junio C Hamano2016-04-061-15/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | git: submodule honor -c credential.* from command lineJacob Keller2016-03-011-13/+23
| * | | submodule: don't pass empty string arguments to submodule--helper cloneJacob Keller2016-03-011-2/+2
* | | | Merge branch 'sb/submodule-parallel-update'Junio C Hamano2016-04-061-34/+22
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | submodule update: expose parallelism to the userStefan Beller2016-03-011-0/+9
| * | git submodule update: have a dedicated helper for cloningStefan Beller2016-03-011-34/+13
| * | submodule update: direct error message to stderrStefan Beller2016-03-011-2/+2
| |/
* | submodule: try harder to fetch needed sha1 by direct fetching sha1sb/submodule-fetch-nontipStefan Beller2016-02-241-3/+26
|/
* Sync with 2.6.1Junio C Hamano2015-10-051-0/+9
|\
| * Sync with 2.4.10Junio C Hamano2015-09-281-0/+9
| |\
| | * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-231-0/+9
| | * Merge branch 'ps/submodule-sanitize-path-upon-add' into maintJunio C Hamano2015-03-051-1/+1
| | |\
| * | \ Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-171-1/+1
| |\ \ \
* | \ \ \ Merge branch 'sb/submodule-helper'Junio C Hamano2015-10-051-149/+15
|\ \ \ \ \
| * | | | | submodule: rewrite `module_clone` shell function in Csb/submodule-helperStefan Beller2015-09-081-76/+2
| * | | | | submodule: rewrite `module_name` shell function in CStefan Beller2015-09-031-25/+7
| * | | | | submodule: rewrite `module_list` shell function in CStefan Beller2015-09-031-48/+6
| |/ / / /
* | | | | Merge branch 'ah/submodule-typofix-in-error'Junio C Hamano2015-09-011-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | Merge branch 'ps/submodule-sanitize-path-upon-add'Junio C Hamano2015-02-221-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | git-submodule.sh: fix '/././' path normalizationps/submodule-sanitize-path-upon-addPatrick Steinhardt2015-02-021-1/+1
* | | git-submodule.sh: avoid "echo" path-like valuesJunio C Hamano2014-06-191-8/+8
* | | git-submodule.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-191-12/+20
* | | Merge branch 'sk/submodules-absolute-path-on-windows'Junio C Hamano2014-06-061-3/+0
|\ \ \
| * | | Revert "submodules: fix ambiguous absolute paths under Windows"sk/submodules-absolute-path-on-windowsStepan Kasal2014-05-081-3/+0
| |/ /
* | | Revert "submodule: explicit local branch creation in module_clone"Junio C Hamano2014-04-021-41/+17
* | | Merge branch 'jl/doc-submodule-update-checkout'Junio C Hamano2014-03-141-1/+1
|\ \ \
| * | | submodule update: consistently document the '--checkout' optionjl/doc-submodule-update-checkoutJens Lehmann2014-02-281-1/+1
* | | | Merge branch 'wk/submodule-on-branch'Junio C Hamano2014-02-271-32/+57
|\ \ \ \ | |/ / /
| * | | submodule: explicit local branch creation in module_cloneW. Trevor King2014-02-241-17/+41
| * | | submodule: document module_clone arguments in commentsW. Trevor King2014-02-241-0/+6
| * | | submodule: make 'checkout' update_module mode more explicitW. Trevor King2014-02-241-16/+11
* | | | Merge branch 'fp/submodule-checkout-mode'Junio C Hamano2014-01-171-1/+12
|\ \ \ \ | |/ / /
| * | | git-submodule.sh: 'checkout' is a valid update modefp/submodule-checkout-modeFrancesco Pretto2014-01-071-1/+12
| |/ /
* | | Merge branch 'jl/submodule-update-retire-orig-flags'Junio C Hamano2013-12-051-4/+1
|\ \ \
| * | | submodule update: remove unnecessary orig_flags variablejl/submodule-update-retire-orig-flagsJens Lehmann2013-11-111-4/+1