blob: 7e5f995f77e48cdc8e9c1b6b58dec8f2896b32cf [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]
Denton Liu68cabbf2019-02-15 01:26:41 -080012'git submodule' [--quiet] [--cached]
Stefan Bellereb2f2f52016-12-27 15:43:08 -080013'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]
Johan Herland64b19ff2009-08-19 03:45:24 +020014'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
Jonathan Niederb1889c32008-06-30 01:09:04 -050015'git submodule' [--quiet] init [--] [<path>...]
Stefan Bellerf6a52792016-05-05 12:52:32 -070016'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
Stefan Bellereb2f2f52016-12-27 15:43:08 -080017'git submodule' [--quiet] update [<options>] [--] [<path>...]
Denton Liub57e8112019-02-08 03:21:34 -080018'git submodule' [--quiet] set-branch [<options>] [--] <path>
Denton Liu26b06102019-10-29 10:01:52 -070019'git submodule' [--quiet] set-url [--] <path> <newurl>
Stefan Bellereb2f2f52016-12-27 15:43:08 -080020'git submodule' [--quiet] summary [<options>] [--] [<path>...]
Johan Herland15fc56a2009-08-19 03:45:22 +020021'git submodule' [--quiet] foreach [--recursive] <command>
Matthew Chen9393ae72014-06-13 13:40:50 -040022'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
Stefan Bellerf6f85862016-12-12 11:04:35 -080023'git submodule' [--quiet] absorbgitdirs [--] [<path>...]
Lars Hjemli70c7ac22007-05-26 15:56:40 +020024
25
Petr Baudise38953a2008-07-16 20:44:12 +020026DESCRIPTION
27-----------
Stefan Bellerec48a762015-05-27 12:48:01 -070028Inspects, updates and manages submodules.
Petr Baudise38953a2008-07-16 20:44:12 +020029
Stefan Bellerd4803452017-06-22 14:01:49 -070030For more information about submodules, see linkgit:gitsubmodules[7].
Petr Baudise38953a2008-07-16 20:44:12 +020031
Lars Hjemli70c7ac22007-05-26 15:56:40 +020032COMMANDS
33--------
Denton Liu68cabbf2019-02-15 01:26:41 -080034With no arguments, shows the status of existing submodules. Several
35subcommands are available to perform operations on the submodules.
36
Stefan Bellereb2f2f52016-12-27 15:43:08 -080037add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]::
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020038 Add the given repository as a submodule at the given path
Mark Levedahlec05df32008-07-09 21:05:40 -040039 to the changeset to be committed next to the current
Cesar Eduardo Barros77ef80a2008-07-26 01:17:42 -030040 project: the current project is termed the "superproject".
Mark Levedahlec05df32008-07-09 21:05:40 -040041+
Mark Levedahlec05df32008-07-09 21:05:40 -040042<repository> is the URL of the new submodule's origin repository.
43This may be either an absolute URL, or (if it begins with ./
Stefan Bellerd1b3b812017-02-24 17:31:47 -080044or ../), the location relative to the superproject's default remote
Jens Lehmann9e6ed472012-01-01 16:13:16 +010045repository (Please note that to specify a repository 'foo.git'
46which is located right next to a superproject 'bar.git', you'll
Corentin BOMPARD68ed71b2019-03-06 14:04:46 +010047have to use `../foo.git` instead of `./foo.git` - as one might expect
Jens Lehmann9e6ed472012-01-01 16:13:16 +010048when following the rules for relative URLs - because the evaluation
49of relative URLs in Git is identical to that of relative directories).
Stefan Bellerd1b3b812017-02-24 17:31:47 -080050+
Robert P. J. Day30aa96c2018-06-07 07:53:36 -040051The default remote is the remote of the remote-tracking branch
52of the current branch. If no such remote-tracking branch exists or
Stefan Bellerd1b3b812017-02-24 17:31:47 -080053the HEAD is detached, "origin" is assumed to be the default remote.
54If the superproject doesn't have a default remote configured
Jens Lehmann4d689322011-06-06 21:58:04 +020055the superproject is its own authoritative upstream and the current
56working directory is used instead.
Mark Levedahlec05df32008-07-09 21:05:40 -040057+
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000058The optional argument <path> is the relative location for the cloned
59submodule to exist in the superproject. If <path> is not given, the
60canonical part of the source repository is used ("repo" for
61"/path/to/repo.git" and "foo" for "host.xz:foo/.git"). If <path>
62exists and is already a valid Git repository, then it is staged
63for commit without cloning. The <path> is also used as the submodule's
64logical name in its configuration entries unless `--name` is used
65to specify a logical name.
Mark Levedahlec05df32008-07-09 21:05:40 -040066+
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000067The given URL is recorded into `.gitmodules` for use by subsequent users
68cloning the superproject. If the URL is given relative to the
69superproject's repository, the presumption is the superproject and
70submodule repositories will be kept together in the same relative
71location, and only the superproject's URL needs to be provided.
72git-submodule will correctly locate the submodule using the relative
73URL in `.gitmodules`.
Sven Verdoolaegeecda0722007-06-24 23:06:07 +020074
Stefan Bellereb2f2f52016-12-27 15:43:08 -080075status [--cached] [--recursive] [--] [<path>...]::
Lars Hjemli70c7ac22007-05-26 15:56:40 +020076 Show the status of the submodules. This will print the SHA-1 of the
77 currently checked out commit for each submodule, along with the
Thomas Rast0b444cd2010-01-10 00:33:00 +010078 submodule path and the output of 'git describe' for the
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +053079 SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is
80 not initialized, `+` if the currently checked out submodule commit
Lars Hjemli70c7ac22007-05-26 15:56:40 +020081 does not match the SHA-1 found in the index of the containing
Nicolas Morey-Chaisemartin313ee0d2011-03-30 07:20:02 +020082 repository and `U` if the submodule has merge conflicts.
Johan Herland64b19ff2009-08-19 03:45:24 +020083+
Manish Goregaokar8d483c82019-11-23 05:54:28 +000084If `--cached` is specified, this command will instead print the SHA-1
85recorded in the superproject for each submodule.
86+
Jens Lehmann402e8a62011-08-01 22:49:21 +020087If `--recursive` is specified, this command will recurse into nested
Johan Herland64b19ff2009-08-19 03:45:24 +020088submodules, and show their status as well.
Jens Lehmann402e8a62011-08-01 22:49:21 +020089+
90If you are only interested in changes of the currently initialized
91submodules with respect to the commit recorded in the index or the HEAD,
92linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
93too (and can also report changes to a submodule's work tree).
Lars Hjemli70c7ac22007-05-26 15:56:40 +020094
Stefan Bellereb2f2f52016-12-27 15:43:08 -080095init [--] [<path>...]::
Dale R. Worley3244eb92013-05-15 18:28:39 -040096 Initialize the submodules recorded in the index (which were
Stefan Bellerd1b3b812017-02-24 17:31:47 -080097 added and committed elsewhere) by setting `submodule.$name.url`
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +000098 in .git/config. It uses the same setting from `.gitmodules` as
Stefan Bellerd1b3b812017-02-24 17:31:47 -080099 a template. If the URL is relative, it will be resolved using
100 the default remote. If there is no default remote, the current
101 repository will be assumed to be upstream.
102+
103Optional <path> arguments limit which submodules will be initialized.
Brandon Williams3e7eaed2017-03-17 15:38:02 -0700104If no path is specified and submodule.active has been configured, submodules
105configured to be active will be initialized, otherwise all submodules are
106initialized.
Stefan Bellerd1b3b812017-02-24 17:31:47 -0800107+
108When present, it will also copy the value of `submodule.$name.update`.
109This command does not alter existing information in .git/config.
110You can then customize the submodule clone URLs in .git/config
111for your local setup and proceed to `git submodule update`;
112you can also just use `git submodule update --init` without
113the explicit 'init' step if you do not intend to customize
114any submodule locations.
115+
Ville Skyttä64127572017-06-25 13:20:41 +0300116See the add subcommand for the definition of default remote.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200117
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800118deinit [-f|--force] (--all|[--] <path>...)::
Jens Lehmanncf419822013-03-04 22:20:24 +0100119 Unregister the given submodules, i.e. remove the whole
120 `submodule.$name` section from .git/config together with their work
121 tree. Further calls to `git submodule update`, `git submodule foreach`
122 and `git submodule sync` will skip any unregistered submodules until
123 they are initialized again, so use this command if you don't want to
Stefan Bellerd4803452017-06-22 14:01:49 -0700124 have a local checkout of the submodule in your working tree anymore.
Jens Lehmanncf419822013-03-04 22:20:24 +0100125+
Stefan Bellerf6a52792016-05-05 12:52:32 -0700126When the command is run without pathspec, it errors out,
127instead of deinit-ing everything, to prevent mistakes.
128+
129If `--force` is specified, the submodule's working tree will
130be removed even if it contains local modifications.
Stefan Bellerd4803452017-06-22 14:01:49 -0700131+
132If you really want to remove a submodule from the repository and commit
133that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
134options.
Jens Lehmanncf419822013-03-04 22:20:24 +0100135
Emily Shaffer132f6002020-02-20 19:10:27 -0800136update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100137+
Michal Sojka5c31acf2015-03-02 23:57:58 +0100138--
139Update the registered submodules to match what the superproject
Philippe Blainf0e58b32019-11-23 21:01:35 -0500140expects by cloning missing submodules, fetching missing commits
141in submodules and updating the working tree of
Michal Sojka5c31acf2015-03-02 23:57:58 +0100142the submodules. The "updating" can be done in several ways depending
143on command line options and the value of `submodule.<name>.update`
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800144configuration variable. The command line option takes precedence over
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530145the configuration variable. If neither is given, a 'checkout' is performed.
146The 'update' procedures supported both from the command line as well as
147through the `submodule.<name>.update` configuration are:
Michal Sojka5c31acf2015-03-02 23:57:58 +0100148
149 checkout;; the commit recorded in the superproject will be
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800150 checked out in the submodule on a detached HEAD.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100151+
152If `--force` is specified, the submodule will be checked out (using
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530153`git checkout --force`), even if the commit specified
Michal Sojka5c31acf2015-03-02 23:57:58 +0100154in the index of the containing repository already matches the commit
155checked out in the submodule.
156
157 rebase;; the current branch of the submodule will be rebased
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800158 onto the commit recorded in the superproject.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100159
160 merge;; the commit recorded in the superproject will be merged
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800161 into the current branch in the submodule.
162
Kaartic Sivaraame1b3f3d2018-01-14 23:07:37 +0530163The following 'update' procedures are only available via the
164`submodule.<name>.update` configuration variable:
Michal Sojka5c31acf2015-03-02 23:57:58 +0100165
166 custom command;; arbitrary shell command that takes a single
167 argument (the sha1 of the commit recorded in the
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800168 superproject) is executed. When `submodule.<name>.update`
169 is set to '!command', the remainder after the exclamation mark
170 is the custom command.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100171
Stefan Bellerfc01a5d2016-12-27 15:43:09 -0800172 none;; the submodule is not updated.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100173
Johannes Schindelinbe4d2c82008-05-16 11:23:03 +0100174If the submodule is not yet initialized, and you just want to use the
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000175setting as stored in `.gitmodules`, you can automatically initialize the
Jens Lehmann402e8a62011-08-01 22:49:21 +0200176submodule with the `--init` option.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100177
Jens Lehmann402e8a62011-08-01 22:49:21 +0200178If `--recursive` is specified, this command will recurse into the
Johan Herlandb13fd5c2009-08-19 03:45:23 +0200179registered submodules, and update any nested submodules within.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100180--
Denton Liu40e747e2019-09-16 11:19:17 -0700181set-branch (-b|--branch) <branch> [--] <path>::
182set-branch (-d|--default) [--] <path>::
Denton Liub57e8112019-02-08 03:21:34 -0800183 Sets the default remote tracking branch for the submodule. The
184 `--branch` option allows the remote branch to be specified. The
185 `--default` option removes the submodule.<name>.branch configuration
Johannes Schindelinf0a96e82020-06-24 14:46:30 +0000186 key, which causes the tracking branch to default to the remote 'HEAD'.
Denton Liub57e8112019-02-08 03:21:34 -0800187
Denton Liu26b06102019-10-29 10:01:52 -0700188set-url [--] <path> <newurl>::
189 Sets the URL of the specified submodule to <newurl>. Then, it will
190 automatically synchronize the submodule's new remote URL
191 configuration.
192
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800193summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
Ping Yin925e7f62008-03-11 21:52:18 +0800194 Show commit summary between the given commit (defaults to HEAD) and
195 working tree/index. For a submodule in question, a series of commits
196 in the submodule between the given super project commit and the
Jens Lehmann402e8a62011-08-01 22:49:21 +0200197 index or working tree (switched by `--cached`) are shown. If the option
198 `--files` is given, show the series of commits in the submodule between
Lars Hjemlief92e1a2009-08-15 10:40:42 +0200199 the index of the super project and the working tree of the submodule
Jens Lehmann402e8a62011-08-01 22:49:21 +0200200 (this option doesn't allow to use the `--cached` option or to provide an
Jens Lehmann1c244f62009-08-13 21:32:50 +0200201 explicit commit).
Jens Lehmann402e8a62011-08-01 22:49:21 +0200202+
203Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
204information too.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200205
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800206foreach [--recursive] <command>::
Mark Levedahl19a31f92008-08-10 19:10:04 -0400207 Evaluates an arbitrary shell command in each checked out submodule.
Prathamesh Chavanb6f7ac82018-05-08 17:29:51 -0700208 The command has access to the variables $name, $sm_path, $displaypath,
209 $sha1 and $toplevel:
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000210 $name is the name of the relevant submodule section in `.gitmodules`,
Prathamesh Chavanf0fd0dc2018-05-08 17:29:50 -0700211 $sm_path is the path of the submodule as recorded in the immediate
Prathamesh Chavanb6f7ac82018-05-08 17:29:51 -0700212 superproject, $displaypath contains the relative path from the
213 current working directory to the submodules root directory,
214 $sha1 is the commit as recorded in the immediate
Prathamesh Chavanf0fd0dc2018-05-08 17:29:50 -0700215 superproject, and $toplevel is the absolute path to the top-level
216 of the immediate superproject.
217 Note that to avoid conflicts with '$PATH' on Windows, the '$path'
218 variable is now a deprecated synonym of '$sm_path' variable.
Mark Levedahl19a31f92008-08-10 19:10:04 -0400219 Any submodules defined in the superproject but not checked out are
Jens Lehmann402e8a62011-08-01 22:49:21 +0200220 ignored by this command. Unless given `--quiet`, foreach prints the name
Mark Levedahl19a31f92008-08-10 19:10:04 -0400221 of each submodule before evaluating the command.
Jens Lehmann402e8a62011-08-01 22:49:21 +0200222 If `--recursive` is given, submodules are traversed recursively (i.e.
Johan Herland15fc56a2009-08-19 03:45:22 +0200223 the given shell command is evaluated in nested submodules as well).
Mark Levedahl19a31f92008-08-10 19:10:04 -0400224 A non-zero return from the command in any submodule causes
225 the processing to terminate. This can be overridden by adding '|| :'
226 to the end of the command.
227+
Jeff Kinge91461b2017-02-13 16:05:49 -0500228As an example, the command below will show the path and currently
229checked out commit for each submodule:
230+
231--------------
Kyle Meyer04e5b3f2020-01-31 12:08:43 -0500232git submodule foreach 'echo $sm_path `git rev-parse HEAD`'
Jeff Kinge91461b2017-02-13 16:05:49 -0500233--------------
Mark Levedahl19a31f92008-08-10 19:10:04 -0400234
Stefan Bellereb2f2f52016-12-27 15:43:08 -0800235sync [--recursive] [--] [<path>...]::
David Aguilar2327f612008-08-24 12:43:37 -0700236 Synchronizes submodules' remote URL configuration setting
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000237 to the value specified in `.gitmodules`. It will only affect those
Jim Meyeringa7793a72012-03-28 10:41:54 +0200238 submodules which already have a URL entry in .git/config (that is the
Junio C Hamanoccee6082011-06-25 22:41:25 +0200239 case when they are initialized or freshly added). This is useful when
David Aguilar2327f612008-08-24 12:43:37 -0700240 submodule URLs change upstream and you need to update your local
241 repositories accordingly.
242+
Martin Ågren4c57a4f2018-04-17 21:15:29 +0200243`git submodule sync` synchronizes all submodules while
244`git submodule sync -- A` synchronizes submodule "A" only.
Stefan Bellere7220c42015-12-03 12:41:02 -0800245+
246If `--recursive` is specified, this command will recurse into the
247registered submodules, and sync any nested submodules within.
Mark Levedahl19a31f92008-08-10 19:10:04 -0400248
Stefan Bellerf6f85862016-12-12 11:04:35 -0800249absorbgitdirs::
250 If a git directory of a submodule is inside the submodule,
Thomas Menzel5814d442020-01-06 14:50:13 +0000251 move the git directory of the submodule into its superproject's
Stefan Bellerf6f85862016-12-12 11:04:35 -0800252 `$GIT_DIR/modules` path and then connect the git directory and
253 its working directory by setting the `core.worktree` and adding
254 a .git file pointing to the git directory embedded in the
255 superprojects git directory.
256+
257A repository that was cloned independently and later added as a submodule or
258old setups have the submodules git directory inside the submodule instead of
259embedded into the superprojects git directory.
260+
261This command is recursive by default.
262
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200263OPTIONS
264-------
Stephan Beyer32402402008-06-08 03:36:09 +0200265-q::
266--quiet::
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200267 Only print error messages.
268
Casey Fitzpatrick6d33e1c2018-05-03 06:53:45 -0400269--progress::
270 This option is only valid for add and update commands.
271 Progress status is reported on the standard error stream
272 by default when it is attached to a terminal, unless -q
273 is specified. This flag forces progress status even if the
274 standard error stream is not directed to a terminal.
275
Stefan Bellerf6a52792016-05-05 12:52:32 -0700276--all::
277 This option is only valid for the deinit command. Unregister all
278 submodules in the working tree.
279
Denton Liu7a4bb552019-02-07 02:18:55 -0800280-b <branch>::
281--branch <branch>::
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200282 Branch of repository to add as submodule.
W. Trevor King15d64932014-03-27 14:06:20 -0700283 The name of the branch is recorded as `submodule.<name>.branch` in
Brandon Williams15ef7802016-10-19 13:42:54 -0700284 `.gitmodules` for `update --remote`. A special value of `.` is used to
285 indicate that the name of the branch in the submodule should be the
Denton Liu7a4bb552019-02-07 02:18:55 -0800286 same name as the current branch in the current repository. If the
Johannes Schindelinf0a96e82020-06-24 14:46:30 +0000287 option is not specified, it defaults to the remote 'HEAD'.
Sven Verdoolaegeecda0722007-06-24 23:06:07 +0200288
Jens Lehmannd27b8762010-07-17 17:11:43 +0200289-f::
290--force::
Jens Lehmanncf419822013-03-04 22:20:24 +0100291 This option is only valid for add, deinit and update commands.
Nicolas Morey-Chaisemartin9db31bd2011-04-01 11:42:03 +0200292 When running add, allow adding an otherwise ignored submodule path.
Stefan Bellerf6a52792016-05-05 12:52:32 -0700293 When running deinit the submodule working trees will be removed even
294 if they contain local changes.
Michal Sojka5c31acf2015-03-02 23:57:58 +0100295 When running update (only effective with the checkout procedure),
296 throw away local changes in submodules when switching to a
297 different commit; and always run a checkout operation in the
298 submodule, even if the commit listed in the index of the
299 containing repository matches the commit checked out in the
300 submodule.
Jens Lehmannd27b8762010-07-17 17:11:43 +0200301
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200302--cached::
Ping Yin925e7f62008-03-11 21:52:18 +0800303 This option is only valid for status and summary commands. These
304 commands typically use the commit found in the submodule HEAD, but
305 with this option, the commit stored in the index is used instead.
306
Jens Lehmann1c244f62009-08-13 21:32:50 +0200307--files::
308 This option is only valid for the summary command. This command
309 compares the commit in the index with that in the submodule HEAD
310 when this option is used.
311
Stephan Beyer32402402008-06-08 03:36:09 +0200312-n::
313--summary-limit::
Ping Yin925e7f62008-03-11 21:52:18 +0800314 This option is only valid for the summary command.
315 Limit the summary size (number of commits shown in total).
Junio C Hamano51836e92008-04-12 18:34:39 -0700316 Giving 0 will disable the summary; a negative number means unlimited
Ping Yin925e7f62008-03-11 21:52:18 +0800317 (the default). This limit only applies to modified submodules. The
318 size is always limited to 1 for added/deleted/typechanged submodules.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200319
W. Trevor King06b1abb2012-12-19 11:03:32 -0500320--remote::
321 This option is only valid for the update command. Instead of using
322 the superproject's recorded SHA-1 to update the submodule, use the
Michael Schubertd6ac1d22013-07-03 11:12:34 +0200323 status of the submodule's remote-tracking branch. The remote used
W. Trevor King06b1abb2012-12-19 11:03:32 -0500324 is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
Johannes Schindelinf0a96e82020-06-24 14:46:30 +0000325 The remote branch used defaults to the remote `HEAD`, but the branch
326 name may be overridden by setting the `submodule.<name>.branch`
327 option in either `.gitmodules` or `.git/config` (with `.git/config`
328 taking precedence).
W. Trevor King06b1abb2012-12-19 11:03:32 -0500329+
330This works for any of the supported update procedures (`--checkout`,
331`--rebase`, etc.). The only change is the source of the target SHA-1.
332For example, `submodule update --remote --merge` will merge upstream
333submodule changes into the submodules, while `submodule update
334--merge` will merge superproject gitlink changes into the submodules.
335+
336In order to ensure a current tracking branch state, `update --remote`
337fetches the submodule's remote repository before calculating the
338SHA-1. If you don't want to fetch, you should use `submodule update
339--remote --no-fetch`.
W. Trevor King9937e652014-01-26 12:45:16 -0800340+
341Use this option to integrate changes from the upstream subproject with
342your submodule's current HEAD. Alternatively, you can run `git pull`
343from the submodule, which is equivalent except for the remote branch
344name: `update --remote` uses the default upstream repository and
345`submodule.<name>.branch`, while `git pull` uses the submodule's
346`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want
347to distribute the default upstream branch with the superproject and
348`branch.<name>.merge` if you want a more native feel while working in
349the submodule itself.
W. Trevor King06b1abb2012-12-19 11:03:32 -0500350
Fabian Franz31ca3ac2009-02-05 20:18:32 -0200351-N::
352--no-fetch::
353 This option is only valid for the update command.
354 Don't fetch new objects from the remote site.
355
Jens Lehmann893a9762014-02-28 22:41:11 +0000356--checkout::
357 This option is only valid for the update command.
358 Checkout the commit recorded in the superproject on a detached HEAD
359 in the submodule. This is the default behavior, the main use of
360 this option is to override `submodule.$name.update` when set to
Michal Sojka5c31acf2015-03-02 23:57:58 +0100361 a value other than `checkout`.
Jens Lehmann893a9762014-02-28 22:41:11 +0000362 If the key `submodule.$name.update` is either not explicitly set or
363 set to `checkout`, this option is implicit.
364
Johan Herland42b49172009-06-03 00:59:12 +0200365--merge::
366 This option is only valid for the update command.
367 Merge the commit recorded in the superproject into the current branch
368 of the submodule. If this option is given, the submodule's HEAD will
369 not be detached. If a merge failure prevents this process, you will
370 have to resolve the resulting conflicts within the submodule with the
371 usual conflict resolution tools.
372 If the key `submodule.$name.update` is set to `merge`, this option is
373 implicit.
374
Peter Huttererca2cedb2009-04-24 09:06:38 +1000375--rebase::
376 This option is only valid for the update command.
377 Rebase the current branch onto the commit recorded in the
378 superproject. If this option is given, the submodule's HEAD will not
Ralf Wildenhues6a5d0b02010-01-31 14:24:39 +0100379 be detached. If a merge failure prevents this process, you will have
Peter Huttererca2cedb2009-04-24 09:06:38 +1000380 to resolve these failures with linkgit:git-rebase[1].
Johan Herland32948422009-06-03 08:27:06 +0200381 If the key `submodule.$name.update` is set to `rebase`, this option is
Peter Huttererca2cedb2009-04-24 09:06:38 +1000382 implicit.
383
Jens Lehmann402e8a62011-08-01 22:49:21 +0200384--init::
385 This option is only valid for the update command.
386 Initialize all submodules for which "git submodule init" has not been
387 called so far before updating.
388
Jens Lehmann73b08982012-09-30 01:05:58 +0200389--name::
390 This option is only valid for the add command. It sets the submodule's
391 name to the given string instead of defaulting to its path. The name
392 must be valid as a directory name and may not end with a '/'.
393
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300394--reference <repository>::
395 This option is only valid for add and update commands. These
396 commands sometimes need to clone a remote repository. In this case,
397 this option will be passed to the linkgit:git-clone[1] command.
398+
399*NOTE*: Do *not* use this option unless you have read the note
Casey Fitzpatricka0ef2932018-05-03 06:53:46 -0400400for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`
401options carefully.
402
403--dissociate::
404 This option is only valid for add and update commands. These
405 commands sometimes need to clone a remote repository. In this case,
406 this option will be passed to the linkgit:git-clone[1] command.
407+
408*NOTE*: see the NOTE for the `--reference` option.
Michael S. Tsirkind92a3952009-05-04 22:30:01 +0300409
Johan Herland15fc56a2009-08-19 03:45:22 +0200410--recursive::
Stefan Bellere7220c42015-12-03 12:41:02 -0800411 This option is only valid for foreach, update, status and sync commands.
Johan Herland15fc56a2009-08-19 03:45:22 +0200412 Traverse submodules recursively. The operation is performed not
413 only in the submodules of the current repo, but also
414 in any nested submodules inside those submodules (and so on).
415
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200416--depth::
417 This option is valid for add and update commands. Create a 'shallow'
418 clone with a history truncated to the specified number of revisions.
419 See linkgit:git-clone[1]
420
Stefan Bellerabed0002016-05-26 14:59:43 -0700421--[no-]recommend-shallow::
422 This option is only valid for the update command.
423 The initial clone of a submodule will use the recommended
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000424 `submodule.<name>.shallow` as provided by the `.gitmodules` file
Stefan Bellerabed0002016-05-26 14:59:43 -0700425 by default. To ignore the suggestions use `--no-recommend-shallow`.
426
Stefan Beller2335b872016-02-29 18:07:19 -0800427-j <n>::
428--jobs <n>::
429 This option is only valid for the update command.
430 Clone new submodules in parallel with as many jobs.
431 Defaults to the `submodule.fetchJobs` option.
Fredrik Gustafsson275cd182013-07-02 23:42:56 +0200432
Emily Shaffer132f6002020-02-20 19:10:27 -0800433--[no-]single-branch::
434 This option is only valid for the update command.
435 Clone only one branch during update: HEAD or one specified by --branch.
436
Abhijit Menon-Senf448e242008-07-30 15:03:43 +0530437<path>...::
438 Paths to submodule(s). When specified this will restrict the command
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200439 to only operate on the submodules found at the specified paths.
Mark Levedahlec05df32008-07-09 21:05:40 -0400440 (This argument is required with add).
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200441
442FILES
443-----
Kaartic Sivaraambeebc6d2017-06-22 02:51:42 +0000444When initializing submodules, a `.gitmodules` file in the top-level directory
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200445of the containing repository is used to find the url of each submodule.
Junio C Hamanoc4585702007-12-27 23:29:53 -0800446This file should be formatted in the same way as `$GIT_DIR/config`. The key
Dan McGee5162e692007-12-29 00:20:38 -0600447to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
Junio C Hamano6fbe42c2007-12-16 22:03:21 -0800448for details.
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200449
Stefan Bellerd4803452017-06-22 14:01:49 -0700450SEE ALSO
451--------
452linkgit:gitsubmodules[7], linkgit:gitmodules[5].
453
Lars Hjemli70c7ac22007-05-26 15:56:40 +0200454GIT
455---
Christian Couder9e1f0a82008-06-06 09:07:32 +0200456Part of the linkgit:git[1] suite