summaryrefslogtreecommitdiff
path: root/git-submodule.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'we/submodule-update-prefix-output' into maintJunio C Hamano2013-03-261-13/+18
|\
| * submodule update: when using recursion, show full pathWilliam Entriken2013-03-031-13/+18
* | Allow custom "comment char"Junio C Hamano2013-01-161-4/+4
* | submodule add: If --branch is given, record it in .gitmodulesW. Trevor King2012-12-191-0/+4
* | submodule update: add --remote for submodule's upstream changesW. Trevor King2012-12-191-1/+20
* | submodule: add get_submodule_config helper funtionW. Trevor King2012-12-111-0/+26
|/
* Merge branch 'wtk/submodule-doc-fixup'Junio C Hamano2012-11-211-1/+1
|\
| * git-submodule: wrap branch option with "<>" in usage strings.W. Trevor King2012-10-251-1/+1
* | Merge branch 'ph/submodule-sync-recursive'Junio C Hamano2012-11-151-2/+12
|\ \
| * | Teach --recursive to submodule syncPhil Hord2012-10-291-2/+12
| |/
* | Merge branch 'ph/maint-submodule-status-fix'Jeff King2012-11-091-3/+1
|\ \
| * | submodule status: remove unused orig_* variablesJens Lehmann2012-10-291-3/+1
* | | Merge branch 'sz/maint-submodule-reference-arg'Jeff King2012-11-041-1/+0
|\ \ \
| * | | submodule add: fix handling of --reference=<repo> optionStefan Zager2012-10-261-1/+0
| |/ /
| * | Merge branch 'rr/maint-submodule-unknown-cmd' into maintJunio C Hamano2012-10-021-1/+9
| |\ \
| * \ \ Sync with 1.7.11.6Junio C Hamano2012-09-111-4/+31
| |\ \ \
* | \ \ \ Merge branch 'jl/submodule-add-by-name'Jeff King2012-10-291-11/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | submodule add: Fail when .git/modules/<name> already exists unless forcedJens Lehmann2012-09-301-1/+14
| * | | | Teach "git submodule add" the --name optionJens Lehmann2012-09-291-10/+22
* | | | | Merge branch 'rr/maint-submodule-unknown-cmd'Junio C Hamano2012-09-291-1/+9
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra2012-09-251-1/+9
| | |/ | |/|
| * | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-111-1/+1
| |\ \
* | \ \ Merge branch 'sz/submodule-force-update'Junio C Hamano2012-09-031-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Make 'git submodule update --force' always check out submodules.Stefan Zager2012-08-241-1/+1
* | | | Merge branch 'hv/submodule-path-unmatch'Junio C Hamano2012-08-291-3/+30
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Let submodule command exit with error status if path does not existHeiko Voigt2012-08-141-3/+30
| * | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maintJunio C Hamano2012-07-301-2/+4
| |\ \ | | |/ | |/|
* | | Merge branch 'jx/i18n-1.7.11'Junio C Hamano2012-07-311-1/+1
|\ \ \
| * | | i18n: Rewrite gettext messages start with dashJiang Xin2012-07-261-1/+1
* | | | git-submodule: work with GIT_DIR/GIT_WORK_TREEDaniel Graña2012-07-251-2/+5
* | | | Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'Junio C Hamano2012-07-221-2/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | submodules: don't stumble over symbolic links when cloning recursivelyJens Lehmann2012-07-121-2/+4
* | | Merge branch 'js/submodule-relative'Junio C Hamano2012-06-281-6/+54
|\ \ \ | |_|/ |/| |
| * | submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo...Jon Seymour2012-06-061-2/+12
| * | submodule: fix sync handling of some relative superproject origin URLsJon Seymour2012-06-061-5/+43
* | | git-submodule.sh: fix filename in comment.Michał Górny2012-06-251-1/+1
* | | submodules: print "registered for path" message only onceJens Lehmann2012-05-291-3/+4
|/ /
* | 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
View Lorry Controller Status