blob: 0474e7af0fe37daa80ead2b8ede312929360d441 [file] [log] [blame]
Lars Hjemli70c7ac22007-05-26 15:56:40 +02001git-submodule(1)
2================
3
4NAME
5----
6git-submodule - Initialize, update or inspect submodules
7
8
9SYNOPSIS
10--------
Matt Kraaib2493642007-07-06 17:56:31 -070011[verse]
Stefan Bellereb2f2f52016-12-27 15:43:08 -080012'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]
Johan Herland64b19ff2009-08-19 03:45:24 +020013'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
Jonathan Niederb1889c32008-06-30 01:09:04 -050014'git submodule' [--quiet] init [--] [<path>...]
Stefan Bellerf6a52792016-05-05 12:52:32 -070015'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
Stefan Bellereb2f2f52016-12-27 15:43:08 -080016'git submodule' [--quiet] update [<options>] [--] [<path>...]
Denton Liub57e8112019-02-08 03:21:34 -080017'git submodule' [--quiet] set-branch [<options>] [--] <path>
Stefan Bellereb2f2f52016-12-27 15:43:08 -080018'git submodule' [--quiet] summary [<options>] [--] [<path>...]
Johan Herland15fc56a2009-08-19 03:45:22 +020019'git submodule' [--quiet] foreach [--recursive] <command>
Matthew Chen9393ae72014-06-13 13:40:50 -040020'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
Stefan Bellerf6f85862016-12-12 11:04:35 -080021'git submodule' [--quiet] absorbgitdirs [--] [<path>...]
Lars Hjemli70c7ac22007-05-26 15:56:40 +020022
23
Petr Baudise38953a2008-07-16 20:44:12 +020024DESCRIPTION
25-----------
Stefan Bellerec48a762015-05-27 12:48:01 -070026Inspects, updates and manages submodules.
Petr Baudise38953a2008-07-16 20:44:12 +020027
Stefan Bellerd4803452017-06-22 14:01:49 -070028For more information about submodules, see linkgit:gitsubmodules[7].
Petr Baudise38953a2008-07-16 20:44:12 +020029
Lars Hjemli70c7ac22007-05-26 15:56:40 +020030COMMANDS
31--------
Stefan Bellereb2f2f52016-12-27 15:43:08 -080032add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]::
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020033 Add the given repository as a submodule at the given path
Mark Levedahlec05df32008-07-09 21:05:40 -040034 to the changeset to be committed next to the current
Cesar Eduardo Barros77ef80a2008-07-26 01:17:42 -030035 project: the current project is termed the "superproject".
Mark Levedahlec05df32008-07-09 21:05:40 -040036+
Mark Levedahlec05df32008-07-09 21:05:40 -040037<repository> is the URL of the new submodule's origin repository.
38This may be either an absolute URL, or (if it begins with ./
Stefan Bellerd1b3b812017-02-24 17:31:47 -080039or ../), the location relative to the superproject's default remote
Jens Lehmann9e6ed472012-01-01 16:13:16 +010040repository (Please note that to specify a repository 'foo.git'
41which is located right next to a superproject 'bar.git', you'll
42have to use '../foo.git' instead of './foo.git' - as one might expect
43when following the rules for relative URLs - because the evaluation
44of relative URLs in Git is identical to that of relative directories).
Stefan Bellerd1b3b812017-02-24 17:31:47 -080045+
Robert P. J. Day30aa96c2018-06-07 07:53:36 -040046The default remote is the remote of the remote-tracking branch
47of the current branch. If no such remote-tracking branch exists or
Stefan Bellerd1b3b812017-02-24 17:31:47 -080048the HEAD is detached, "origin" is assumed to be the default remote.
49If the superproject doesn't have a default remote configured
Jens Lehmann4d689322011-06-06 21:58:04 +020050the superproject is its own authoritative upstream and the current
51working directory is used instead.
Mark Levedahlec05df32008-07-09 21:05:40 -040052+
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000053The optional argument <path> is the relative location for the cloned
54submodule to exist in the superproject. If <path> is not given, the
55canonical part of the source repository is used ("repo" for
56"/path/to/repo.git" and "foo" for "host.xz:foo/.git"). If <path>
57exists and is already a valid Git repository, then it is staged
58for commit without cloning. The <path> is also used as the submodule's
59logical name in its configuration entries unless `--name` is used
60to specify a logical name.
Mark Levedahlec05df32008-07-09 21:05:40 -040061+
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000062The given URL is recorded into `.gitmodules` for use by subsequent users
63cloning the superproject. If the URL is given relative to the
64superproject's repository, the presumption is the superproject and
65submodule repositories will be kept together in the same relative
66location, and only the superproject's URL needs to be provided.
67git-submodule will correctly locate the submodule using the relative
68URL in `.gitmodules`.
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020069
Stefan Bellereb2f2f52016-12-27 15:43:08 -080070status [--cached] [--recursive] [--] [<path>...]::
Lars Hjemli70c7ac22007-05-26 15:56:40 +020071 Show the status of the submodules. This will print the SHA-1 of the
72 currently checked out commit for each submodule, along with the
Thomas Rast0b444cd2010-01-10 00:33:00 +010073 submodule path and the output of 'git describe' for the
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +053074 SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is
75 not initialized, `+` if the currently checked out submodule commit
Lars Hjemli70c7ac22007-05-26 15:56:40 +020076 does not match the SHA-1 found in the index of the containing
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +020077 repository and `U` if the submodule has merge conflicts.
Johan Herland64b19ff2009-08-19 03:45:24 +020078+
Jens Lehmann402e8a62011-08-01 22:49:21 +020079If `--recursive` is specified, this command will recurse into nested
Johan Herland64b19ff2009-08-19 03:45:24 +020080submodules, and show their status as well.
Jens Lehmann402e8a62011-08-01 22:49:21 +020081+
82If you are only interested in changes of the currently initialized
83submodules with respect to the commit recorded in the index or the HEAD,
84linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
85too (and can also report changes to a submodule's work tree).
Lars Hjemli70c7ac22007-05-26 15:56:40 +020086
Stefan Bellereb2f2f52016-12-27 15:43:08 -080087init [--] [<path>...]::
Dale R. Worley3244eb92013-05-15 18:28:39 -040088 Initialize the submodules recorded in the index (which were
Stefan Bellerd1b3b812017-02-24 17:31:47 -080089 added and committed elsewhere) by setting `submodule.$name.url`
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000090 in .git/config. It uses the same setting from `.gitmodules` as
Stefan Bellerd1b3b812017-02-24 17:31:47 -080091 a template. If the URL is relative, it will be resolved using
92 the default remote. If there is no default remote, the current
93 repository will be assumed to be upstream.
94+
95Optional <path> arguments limit which submodules will be initialized.
Brandon Williams3e7eaed2017-03-17 15:38:02 -070096If no path is specified and submodule.active has been configured, submodules
97configured to be active will be initialized, otherwise all submodules are
98initialized.
Stefan Bellerd1b3b812017-02-24 17:31:47 -080099+
100When present, it will also copy the value of `submodule.$name.update`.
101This command does not alter existing information in .git/config.
102You can then customize the submodule clone URLs in .git/config
103for your local setup and proceed to `git submodule update`;
104you can also just use `git submodule update --init` without
105the explicit 'init' step if you do not intend to customize
106any submodule locations.
107+
Ville Skyttä64127572017-06-25 13:20:41 +0300108See the add subcommand for the definition of default remote.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200109
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800110deinit [-f|--force] (--all|[--] <path>...)::
Jens Lehmanncf419822013-03-04 22:20:24 +0100111 Unregister the given submodules, i.e. remove the whole
112 `submodule.$name` section from .git/config together with their work
113 tree. Further calls to `git submodule update`, `git submodule foreach`
114 and `git submodule sync` will skip any unregistered submodules until
115 they are initialized again, so use this command if you don't want to
Stefan Bellerd4803452017-06-22 14:01:49 -0700116 have a local checkout of the submodule in your working tree anymore.
Jens Lehmanncf419822013-03-04 22:20:24 +0100117+
Stefan Bellerf6a52792016-05-05 12:52:32 -0700118When the command is run without pathspec, it errors out,
119instead of deinit-ing everything, to prevent mistakes.
120+
121If `--force` is specified, the submodule's working tree will
122be removed even if it contains local modifications.
Stefan Bellerd4803452017-06-22 14:01:49 -0700123+
124If you really want to remove a submodule from the repository and commit
125that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
126options.
Jens Lehmanncf419822013-03-04 22:20:24 +0100127
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800128update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]::
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100129+
Michal Sojka5c31acf2015-03-02 23:57:58 +0100130--
131Update the registered submodules to match what the superproject
132expects by cloning missing submodules and updating the working tree of
133the submodules. The "updating" can be done in several ways depending
134on command line options and the value of `submodule.<name>.update`
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800135configuration variable. The command line option takes precedence over
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530136the configuration variable. If neither is given, a 'checkout' is performed.
137The 'update' procedures supported both from the command line as well as
138through the `submodule.<name>.update` configuration are:
Michal Sojka5c31acf2015-03-02 23:57:58 +0100139
140 checkout;; the commit recorded in the superproject will be
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800141 checked out in the submodule on a detached HEAD.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100142+
143If `--force` is specified, the submodule will be checked out (using
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530144`git checkout --force`), even if the commit specified
Michal Sojka5c31acf2015-03-02 23:57:58 +0100145in the index of the containing repository already matches the commit
146checked out in the submodule.
147
148 rebase;; the current branch of the submodule will be rebased
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800149 onto the commit recorded in the superproject.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100150
151 merge;; the commit recorded in the superproject will be merged
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800152 into the current branch in the submodule.
153
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530154The following 'update' procedures are only available via the
155`submodule.<name>.update` configuration variable:
Michal Sojka5c31acf2015-03-02 23:57:58 +0100156
157 custom command;; arbitrary shell command that takes a single
158 argument (the sha1 of the commit recorded in the
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800159 superproject) is executed. When `submodule.<name>.update`
160 is set to '!command', the remainder after the exclamation mark
161 is the custom command.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100162
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800163 none;; the submodule is not updated.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100164
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100165If the submodule is not yet initialized, and you just want to use the
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000166setting as stored in `.gitmodules`, you can automatically initialize the
Jens Lehmann402e8a62011-08-01 22:49:21 +0200167submodule with the `--init` option.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100168
Jens Lehmann402e8a62011-08-01 22:49:21 +0200169If `--recursive` is specified, this command will recurse into the
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200170registered submodules, and update any nested submodules within.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100171--
Denton Liu40e747e2019-09-16 11:19:17 -0700172set-branch (-b|--branch) <branch> [--] <path>::
173set-branch (-d|--default) [--] <path>::
Denton Liub57e8112019-02-08 03:21:34 -0800174 Sets the default remote tracking branch for the submodule. The
175 `--branch` option allows the remote branch to be specified. The
176 `--default` option removes the submodule.<name>.branch configuration
177 key, which causes the tracking branch to default to 'master'.
178
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800179summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
Ping Yin925e7f62008-03-11 21:52:18 +0800180 Show commit summary between the given commit (defaults to HEAD) and
181 working tree/index. For a submodule in question, a series of commits
182 in the submodule between the given super project commit and the
Jens Lehmann402e8a62011-08-01 22:49:21 +0200183 index or working tree (switched by `--cached`) are shown. If the option
184 `--files` is given, show the series of commits in the submodule between
Lars Hjemlief92e1a2009-08-15 10:40:42 +0200185 the index of the super project and the working tree of the submodule
Jens Lehmann402e8a62011-08-01 22:49:21 +0200186 (this option doesn't allow to use the `--cached` option or to provide an
Jens Lehmann1c244f62009-08-13 21:32:50 +0200187 explicit commit).
Jens Lehmann402e8a62011-08-01 22:49:21 +0200188+
189Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
190information too.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200191
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800192foreach [--recursive] <command>::
Mark Levedahl19a31f92008-08-10 19:10:04 -0400193 Evaluates an arbitrary shell command in each checked out submodule.
Prathamesh Chavanb6f7ac82018-05-08 17:29:51 -0700194 The command has access to the variables $name, $sm_path, $displaypath,
195 $sha1 and $toplevel:
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000196 $name is the name of the relevant submodule section in `.gitmodules`,
Prathamesh Chavanf0fd0dc2018-05-08 17:29:50 -0700197 $sm_path is the path of the submodule as recorded in the immediate
Prathamesh Chavanb6f7ac82018-05-08 17:29:51 -0700198 superproject, $displaypath contains the relative path from the
199 current working directory to the submodules root directory,
200 $sha1 is the commit as recorded in the immediate
Prathamesh Chavanf0fd0dc2018-05-08 17:29:50 -0700201 superproject, and $toplevel is the absolute path to the top-level
202 of the immediate superproject.
203 Note that to avoid conflicts with '$PATH' on Windows, the '$path'
204 variable is now a deprecated synonym of '$sm_path' variable.
Mark Levedahl19a31f92008-08-10 19:10:04 -0400205 Any submodules defined in the superproject but not checked out are
Jens Lehmann402e8a62011-08-01 22:49:21 +0200206 ignored by this command. Unless given `--quiet`, foreach prints the name
Mark Levedahl19a31f92008-08-10 19:10:04 -0400207 of each submodule before evaluating the command.
Jens Lehmann402e8a62011-08-01 22:49:21 +0200208 If `--recursive` is given, submodules are traversed recursively (i.e.
Johan Herland15fc56a2009-08-19 03:45:22 +0200209 the given shell command is evaluated in nested submodules as well).
Mark Levedahl19a31f92008-08-10 19:10:04 -0400210 A non-zero return from the command in any submodule causes
211 the processing to terminate. This can be overridden by adding '|| :'
212 to the end of the command.
213+
Jeff Kinge91461b2017-02-13 16:05:49 -0500214As an example, the command below will show the path and currently
215checked out commit for each submodule:
216+
217--------------
218git submodule foreach 'echo $path `git rev-parse HEAD`'
219--------------
Mark Levedahl19a31f92008-08-10 19:10:04 -0400220
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800221sync [--recursive] [--] [<path>...]::
David Aguilar2327f612008-08-24 12:43:37 -0700222 Synchronizes submodules' remote URL configuration setting
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000223 to the value specified in `.gitmodules`. It will only affect those
Jim Meyeringa7793a72012-03-28 10:41:54 +0200224 submodules which already have a URL entry in .git/config (that is the
Junio C Hamanoccee6082011-06-25 22:41:25 +0200225 case when they are initialized or freshly added). This is useful when
David Aguilar2327f612008-08-24 12:43:37 -0700226 submodule URLs change upstream and you need to update your local
227 repositories accordingly.
228+
Martin Ågren4c57a4f2018-04-17 21:15:29 +0200229`git submodule sync` synchronizes all submodules while
230`git submodule sync -- A` synchronizes submodule "A" only.
Stefan Bellere7220c42015-12-03 12:41:02 -0800231+
232If `--recursive` is specified, this command will recurse into the
233registered submodules, and sync any nested submodules within.
Mark Levedahl19a31f92008-08-10 19:10:04 -0400234
Stefan Bellerf6f85862016-12-12 11:04:35 -0800235absorbgitdirs::
236 If a git directory of a submodule is inside the submodule,
237 move the git directory of the submodule into its superprojects
238 `$GIT_DIR/modules` path and then connect the git directory and
239 its working directory by setting the `core.worktree` and adding
240 a .git file pointing to the git directory embedded in the
241 superprojects git directory.
242+
243A repository that was cloned independently and later added as a submodule or
244old setups have the submodules git directory inside the submodule instead of
245embedded into the superprojects git directory.
246+
247This command is recursive by default.
248
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200249OPTIONS
250-------
Stephan Beyer32402402008-06-08 03:36:09 +0200251-q::
252--quiet::
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200253 Only print error messages.
254
Casey Fitzpatrick6d33e1c2018-05-03 06:53:45 -0400255--progress::
256 This option is only valid for add and update commands.
257 Progress status is reported on the standard error stream
258 by default when it is attached to a terminal, unless -q
259 is specified. This flag forces progress status even if the
260 standard error stream is not directed to a terminal.
261
Stefan Bellerf6a52792016-05-05 12:52:32 -0700262--all::
263 This option is only valid for the deinit command. Unregister all
264 submodules in the working tree.
265
Denton Liu7a4bb552019-02-07 02:18:55 -0800266-b <branch>::
267--branch <branch>::
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200268 Branch of repository to add as submodule.
W. Trevor King15d64932014-03-27 14:06:20 -0700269 The name of the branch is recorded as `submodule.<name>.branch` in
Brandon Williams15ef7802016-10-19 13:42:54 -0700270 `.gitmodules` for `update --remote`. A special value of `.` is used to
271 indicate that the name of the branch in the submodule should be the
Denton Liu7a4bb552019-02-07 02:18:55 -0800272 same name as the current branch in the current repository. If the
273 option is not specified, it defaults to 'master'.
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200274
Jens Lehmannd27b8762010-07-17 17:11:43 +0200275-f::
276--force::
Jens Lehmanncf419822013-03-04 22:20:24 +0100277 This option is only valid for add, deinit and update commands.
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200278 When running add, allow adding an otherwise ignored submodule path.
Stefan Bellerf6a52792016-05-05 12:52:32 -0700279 When running deinit the submodule working trees will be removed even
280 if they contain local changes.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100281 When running update (only effective with the checkout procedure),
282 throw away local changes in submodules when switching to a
283 different commit; and always run a checkout operation in the
284 submodule, even if the commit listed in the index of the
285 containing repository matches the commit checked out in the
286 submodule.
Jens Lehmannd27b8762010-07-17 17:11:43 +0200287
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200288--cached::
Ping Yin925e7f62008-03-11 21:52:18 +0800289 This option is only valid for status and summary commands. These
290 commands typically use the commit found in the submodule HEAD, but
291 with this option, the commit stored in the index is used instead.
292
Jens Lehmann1c244f62009-08-13 21:32:50 +0200293--files::
294 This option is only valid for the summary command. This command
295 compares the commit in the index with that in the submodule HEAD
296 when this option is used.
297
Stephan Beyer32402402008-06-08 03:36:09 +0200298-n::
299--summary-limit::
Ping Yin925e7f62008-03-11 21:52:18 +0800300 This option is only valid for the summary command.
301 Limit the summary size (number of commits shown in total).
Junio C Hamano51836e92008-04-12 18:34:39 -0700302 Giving 0 will disable the summary; a negative number means unlimited
Ping Yin925e7f62008-03-11 21:52:18 +0800303 (the default). This limit only applies to modified submodules. The
304 size is always limited to 1 for added/deleted/typechanged submodules.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200305
W. Trevor King06b1abb2012-12-19 11:03:32 -0500306--remote::
307 This option is only valid for the update command. Instead of using
308 the superproject's recorded SHA-1 to update the submodule, use the
Michael Schubertd6ac1d22013-07-03 11:12:34 +0200309 status of the submodule's remote-tracking branch. The remote used
W. Trevor King06b1abb2012-12-19 11:03:32 -0500310 is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
311 The remote branch used defaults to `master`, but the branch name may
312 be overridden by setting the `submodule.<name>.branch` option in
313 either `.gitmodules` or `.git/config` (with `.git/config` taking
314 precedence).
315+
316This works for any of the supported update procedures (`--checkout`,
317`--rebase`, etc.). The only change is the source of the target SHA-1.
318For example, `submodule update --remote --merge` will merge upstream
319submodule changes into the submodules, while `submodule update
320--merge` will merge superproject gitlink changes into the submodules.
321+
322In order to ensure a current tracking branch state, `update --remote`
323fetches the submodule's remote repository before calculating the
324SHA-1. If you don't want to fetch, you should use `submodule update
325--remote --no-fetch`.
W. Trevor King9937e652014-01-26 12:45:16 -0800326+
327Use this option to integrate changes from the upstream subproject with
328your submodule's current HEAD. Alternatively, you can run `git pull`
329from the submodule, which is equivalent except for the remote branch
330name: `update --remote` uses the default upstream repository and
331`submodule.<name>.branch`, while `git pull` uses the submodule's
332`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want
333to distribute the default upstream branch with the superproject and
334`branch.<name>.merge` if you want a more native feel while working in
335the submodule itself.
W. Trevor King06b1abb2012-12-19 11:03:32 -0500336
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200337-N::
338--no-fetch::
339 This option is only valid for the update command.
340 Don't fetch new objects from the remote site.
341
Jens Lehmann893a9762014-02-28 22:41:11 +0000342--checkout::
343 This option is only valid for the update command.
344 Checkout the commit recorded in the superproject on a detached HEAD
345 in the submodule. This is the default behavior, the main use of
346 this option is to override `submodule.$name.update` when set to
Michal Sojka5c31acf2015-03-02 23:57:58 +0100347 a value other than `checkout`.
Jens Lehmann893a9762014-02-28 22:41:11 +0000348 If the key `submodule.$name.update` is either not explicitly set or
349 set to `checkout`, this option is implicit.
350
Johan Herland42b49172009-06-03 00:59:12 +0200351--merge::
352 This option is only valid for the update command.
353 Merge the commit recorded in the superproject into the current branch
354 of the submodule. If this option is given, the submodule's HEAD will
355 not be detached. If a merge failure prevents this process, you will
356 have to resolve the resulting conflicts within the submodule with the
357 usual conflict resolution tools.
358 If the key `submodule.$name.update` is set to `merge`, this option is
359 implicit.
360
Peter Huttererca2cedb2009-04-24 09:06:38 +1000361--rebase::
362 This option is only valid for the update command.
363 Rebase the current branch onto the commit recorded in the
364 superproject. If this option is given, the submodule's HEAD will not
Ralf Wildenhues6a5d0b02010-01-31 14:24:39 +0100365 be detached. If a merge failure prevents this process, you will have
Peter Huttererca2cedb2009-04-24 09:06:38 +1000366 to resolve these failures with linkgit:git-rebase[1].
Johan Herland32948422009-06-03 08:27:06 +0200367 If the key `submodule.$name.update` is set to `rebase`, this option is
Peter Huttererca2cedb2009-04-24 09:06:38 +1000368 implicit.
369
Jens Lehmann402e8a62011-08-01 22:49:21 +0200370--init::
371 This option is only valid for the update command.
372 Initialize all submodules for which "git submodule init" has not been
373 called so far before updating.
374
Jens Lehmann73b08982012-09-30 01:05:58 +0200375--name::
376 This option is only valid for the add command. It sets the submodule's
377 name to the given string instead of defaulting to its path. The name
378 must be valid as a directory name and may not end with a '/'.
379
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300380--reference <repository>::
381 This option is only valid for add and update commands. These
382 commands sometimes need to clone a remote repository. In this case,
383 this option will be passed to the linkgit:git-clone[1] command.
384+
385*NOTE*: Do *not* use this option unless you have read the note
Casey Fitzpatricka0ef2932018-05-03 06:53:46 -0400386for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`
387options carefully.
388
389--dissociate::
390 This option is only valid for add and update commands. These
391 commands sometimes need to clone a remote repository. In this case,
392 this option will be passed to the linkgit:git-clone[1] command.
393+
394*NOTE*: see the NOTE for the `--reference` option.
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300395
Johan Herland15fc56a2009-08-19 03:45:22 +0200396--recursive::
Stefan Bellere7220c42015-12-03 12:41:02 -0800397 This option is only valid for foreach, update, status and sync commands.
Johan Herland15fc56a2009-08-19 03:45:22 +0200398 Traverse submodules recursively. The operation is performed not
399 only in the submodules of the current repo, but also
400 in any nested submodules inside those submodules (and so on).
401
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200402--depth::
403 This option is valid for add and update commands. Create a 'shallow'
404 clone with a history truncated to the specified number of revisions.
405 See linkgit:git-clone[1]
406
Stefan Bellerabed0002016-05-26 14:59:43 -0700407--[no-]recommend-shallow::
408 This option is only valid for the update command.
409 The initial clone of a submodule will use the recommended
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000410 `submodule.<name>.shallow` as provided by the `.gitmodules` file
Stefan Bellerabed0002016-05-26 14:59:43 -0700411 by default. To ignore the suggestions use `--no-recommend-shallow`.
412
Stefan Beller2335b872016-02-29 18:07:19 -0800413-j <n>::
414--jobs <n>::
415 This option is only valid for the update command.
416 Clone new submodules in parallel with as many jobs.
417 Defaults to the `submodule.fetchJobs` option.
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200418
Abhijit Menon-Senf448e242008-07-30 15:03:43 +0530419<path>...::
420 Paths to submodule(s). When specified this will restrict the command
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200421 to only operate on the submodules found at the specified paths.
Mark Levedahlec05df32008-07-09 21:05:40 -0400422 (This argument is required with add).
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200423
424FILES
425-----
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000426When initializing submodules, a `.gitmodules` file in the top-level directory
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200427of the containing repository is used to find the url of each submodule.
Junio C Hamanoc4585702007-12-27 23:29:53 -0800428This file should be formatted in the same way as `$GIT_DIR/config`. The key
Dan McGee5162e692007-12-29 00:20:38 -0600429to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
Junio C Hamano6fbe42c2007-12-16 22:03:21 -0800430for details.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200431
Stefan Bellerd4803452017-06-22 14:01:49 -0700432SEE ALSO
433--------
434linkgit:gitsubmodules[7], linkgit:gitmodules[5].
435
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200436GIT
437---
Christian Couder9e1f0a82008-06-06 09:07:32 +0200438Part of the linkgit:git[1] suite