summaryrefslogtreecommitdiff
path: root/git-submodule.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rj/submodule-mswin-path'Junio C Hamano2012-04-231-79/+82
|\
| * git-submodule.sh: Don't use $path variable in eval_gettext stringRamsay Jones2012-04-181-79/+82
* | Avoid bug in Solaris xpg4/sed as used in submoduleBen Walton2012-04-091-2/+3
|/
* submodules: fix ambiguous absolute paths under Windowsjl/maint-submodule-relativeJohannes Sixt2012-03-041-0/+3
* submodules: refactor computation of relative gitdir pathJens Lehmann2012-03-041-24/+6
* submodules: always use a relative path from gitdir to work treeJens Lehmann2012-03-041-0/+18
* submodules: always use a relative path to gitdirJens Lehmann2012-03-041-7/+4
* submodule add: fix breakage when re-adding a deep submodulejl/submodule-re-addJens Lehmann2012-01-241-0/+1
* Merge branch 'tc/submodule-clone-name-detection'Junio C Hamano2011-10-261-4/+4
|\
| * submodule::module_clone(): silence die() message from module_name()Tay Ray Chuan2011-10-211-1/+1
| * submodule: whitespace fixTay Ray Chuan2011-10-211-3/+3
* | Merge branch 'fg/submodule-git-file-git-dir'Junio C Hamano2011-10-101-11/+57
|\ \ | |/
| * Move git-dir for submodulesfg/submodule-git-file-git-dirFredrik Gustafsson2011-08-221-5/+40
* | Merge branch 'js/i18n-scripts'Junio C Hamano2011-08-251-12/+6
|\ \
| * | submodule: take advantage of gettextln and eval_gettextln.Jon Seymour2011-08-081-12/+6
| |/
* | Merge branch 'jl/submodule-update-quiet'Junio C Hamano2011-08-081-2/+7
|\ \ | |/ |/|
| * submodule: update and add must honor --quiet flagJens Lehmann2011-07-281-2/+7
* | Merge branch 'jl/submodule-add-relurl-wo-upstream'Junio C Hamano2011-07-221-10/+2
|\ \
| * | submodule add: clean up duplicated codeJens Lehmann2011-06-061-9/+1
| * | submodule add: allow relative repository path even when no url is setJens Lehmann2011-06-061-1/+1
* | | Merge branch 'jc/submodule-sync-no-auto-vivify'Junio C Hamano2011-07-191-27/+31
|\ \ \
| * | | submodule add: always initialize .git/config entryJens Lehmann2011-06-261-17/+18
| * | | submodule sync: do not auto-vivify uninteresting submoduleJunio C Hamano2011-06-261-10/+13
* | | | Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4'Junio C Hamano2011-07-131-1/+5
|\ \ \ \
| * | | | git-submodule.sh: preserve stdin for the command spawned by foreachBrandon Casey2011-06-291-1/+5
* | | | | Merge branch 'fg/submodule-keep-updating'Junio C Hamano2011-07-131-5/+44
|\ \ \ \ \
| * | | | | git-submodule.sh: clarify the "should we die now" logicJunio C Hamano2011-06-131-9/+8
| * | | | | submodule update: continue when a checkout failsFredrik Gustafsson2011-06-131-6/+44
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ab/i18n-scripts' into nextJunio C Hamano2011-06-291-45/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+4
| * | | | i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason2011-05-211-2/+2
| * | | | i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason2011-05-211-3/+6
| * | | | i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason2011-05-211-3/+3
| * | | | i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+2
| * | | | i18n: git-submodule "cached cannot be used" messageÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason2011-05-211-9/+8
| * | | | i18n: git-submodule die + eval_gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-19/+19
| * | | | i18n: git-submodule say + eval_gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-1/+1
| * | | | i18n: git-submodule echo + eval_gettext messagesÆvar Arnfjörð Bjarmason2011-05-211-2/+5
| * | | | i18n: git-submodule add git-sh-i18nÆvar Arnfjörð Bjarmason2011-05-211-0/+1
* | | | | Merge branch 'maint'Junio C Hamano2011-05-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | git-submodule.sh: separate parens by a space to avoid confusing some shellsBrandon Casey2011-05-261-1/+1
* | | | Merge branch 'nm/submodule-update-force'Junio C Hamano2011-05-021-5/+9
|\ \ \ \ | |/ / / |/| | |
| * | | submodule: Add --force option for git submodule updateNicolas Morey-Chaisemartin2011-04-041-5/+9
* | | | Merge branch 'jl/submodule-fetch-on-demand'Junio C Hamano2011-04-041-1/+4
|\ \ \ \
| * | | | submodule update: Don't fetch when the submodule commit is already presentJens Lehmann2011-03-091-1/+4
* | | | | submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin2011-03-301-1/+28
| |/ / / |/| | |
* | | | submodule: no [--merge|--rebase] when newly clonedSpencer E. Olson2011-02-171-0/+9
|/ / /
* | | Merge branch 'tr/submodule-relative-scp-url'Junio C Hamano2011-01-131-2/+14
|\ \ \
View Lorry Controller Status