blob: f17687e09d322f909ae4236c297e769d2e949b90 [file] [log] [blame]
Junio C Hamano38b693c2007-06-03 08:40:141git-submodule(1)
2================
3
4NAME
5----
6git-submodule - Initialize, update or inspect submodules
7
8
9SYNOPSIS
10--------
Junio C Hamano7a4a2832007-07-07 21:53:2211[verse]
Junio C Hamanoac28f432012-11-21 21:58:5812'git submodule' [--quiet] add [-b <branch>] [-f|--force] [--name <name>]
Junio C Hamanoededf2b2013-07-15 21:11:1613 [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]
Junio C Hamano0e066b92009-08-28 01:08:4114'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
Junio C Hamanofce7c7e2008-07-02 03:06:3815'git submodule' [--quiet] init [--] [<path>...]
Junio C Hamano240dc3f2013-03-25 23:37:0316'git submodule' [--quiet] deinit [-f|--force] [--] <path>...
Junio C Hamano68061622013-03-01 22:13:3717'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
Junio C Hamano90acbd72014-04-02 22:40:3418 [-f|--force] [--rebase|--merge] [--reference <repository>]
Junio C Hamano5b3533d2014-02-27 23:07:1519 [--depth <depth>] [--recursive] [--] [<path>...]
Junio C Hamanoe1296e92011-08-08 22:58:1520'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
21 [commit] [--] [<path>...]
Junio C Hamano0e066b92009-08-28 01:08:4122'git submodule' [--quiet] foreach [--recursive] <command>
Junio C Hamano38d02532014-06-26 21:48:5023'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
Junio C Hamano38b693c2007-06-03 08:40:1424
25
Junio C Hamanof69a0a02008-07-17 08:08:4726DESCRIPTION
27-----------
Junio C Hamano8c5d5942015-06-11 19:37:4828Inspects, updates and manages submodules.
Junio C Hamanof69a0a02008-07-17 08:08:4729
Junio C Hamano8c5d5942015-06-11 19:37:4830A submodule allows you to keep another Git repository in a subdirectory
31of your repository. The other repository has its own history, which does not
32interfere with the history of the current repository. This can be used to
33have external dependencies such as third party libraries for example.
34
35When cloning or pulling a repository containing submodules however,
36these will not be checked out by default; the 'init' and 'update'
37subcommands will maintain submodules checked out and at
38appropriate revision in your working tree.
Junio C Hamanof69a0a02008-07-17 08:08:4739
Junio C Hamano915cd9b2008-07-20 01:24:1740Submodules are composed from a so-called `gitlink` tree entry
41in the main repository that refers to a particular commit object
42within the inner repository that is completely separate.
Junio C Hamanof94fd6c2012-05-17 22:55:1443A record in the `.gitmodules` (see linkgit:gitmodules[5]) file at the
44root of the source tree assigns a logical name to the submodule and
45describes the default URL the submodule shall be cloned from.
Junio C Hamano915cd9b2008-07-20 01:24:1746The logical name can be used for overriding this URL within your
47local repository configuration (see 'submodule init').
48
Junio C Hamano8c5d5942015-06-11 19:37:4849Submodules are not to be confused with remotes, which are other
50repositories of the same project; submodules are meant for
51different projects you would like to make part of your source tree,
52while the history of the two projects still stays completely
53independent and you cannot modify the contents of the submodule
54from within the main project.
55If you want to merge the project histories and want to treat the
56aggregated whole as a single project from then on, you may want to
57add a remote for the other project and use the 'subtree' merge strategy,
58instead of treating the other project as a submodule. Directories
59that come from both projects can be cloned and checked out as a whole
60if you choose to go that route.
Junio C Hamanof69a0a02008-07-17 08:08:4761
Junio C Hamano38b693c2007-06-03 08:40:1462COMMANDS
63--------
Junio C Hamano1d90cb02007-07-03 07:05:3164add::
65Add the given repository as a submodule at the given path
Junio C Hamano38ddcce2008-07-15 15:49:0366to the changeset to be committed next to the current
Junio C Hamano85c71572008-07-28 00:03:3167project: the current project is termed the "superproject".
Junio C Hamano38ddcce2008-07-15 15:49:0368+
Junio C Hamano3b70d3c2009-11-21 17:37:3769This requires at least one argument: <repository>. The optional
70argument <path> is the relative location for the cloned submodule
71to exist in the superproject. If <path> is not given, the
72"humanish" part of the source repository is used ("repo" for
73"/path/to/repo.git" and "foo" for "host.xz:foo/.git").
Junio C Hamano3d1b5a12013-05-17 23:34:0274The <path> is also used as the submodule's logical name in its
75configuration entries unless `--name` is used to specify a logical name.
Junio C Hamano38ddcce2008-07-15 15:49:0376+
77<repository> is the URL of the new submodule's origin repository.
78This may be either an absolute URL, or (if it begins with ./
79or ../), the location relative to the superproject's origin
Junio C Hamanodb472bc2012-01-04 00:22:3780repository (Please note that to specify a repository 'foo.git'
81which is located right next to a superproject 'bar.git', you'll
82have to use '../foo.git' instead of './foo.git' - as one might expect
83when following the rules for relative URLs - because the evaluation
84of relative URLs in Git is identical to that of relative directories).
85If the superproject doesn't have an origin configured
Junio C Hamano15567bc2011-07-23 00:51:5986the superproject is its own authoritative upstream and the current
87working directory is used instead.
Junio C Hamano38ddcce2008-07-15 15:49:0388+
89<path> is the relative location for the cloned submodule to
90exist in the superproject. If <path> does not exist, then the
91submodule is created by cloning from the named URL. If <path> does
Junio C Hamano076ffcc2013-02-06 05:13:2192exist and is already a valid Git repository, then this is added
Junio C Hamano38ddcce2008-07-15 15:49:0393to the changeset without cloning. This second form is provided
94to ease creating a new submodule from scratch, and presumes
95the user will later push the submodule to the given URL.
96+
97In either case, the given URL is recorded into .gitmodules for
98use by subsequent users cloning the superproject. If the URL is
99given relative to the superproject's repository, the presumption
100is the superproject and submodule repositories will be kept
101together in the same relative location, and only the
Junio C Hamano54bf1e22008-12-20 06:30:11102superproject's URL needs to be provided: git-submodule will correctly
Junio C Hamano38ddcce2008-07-15 15:49:03103locate the submodule using the relative URL in .gitmodules.
Junio C Hamano1d90cb02007-07-03 07:05:31104
Junio C Hamano38b693c2007-06-03 08:40:14105status::
106Show the status of the submodules. This will print the SHA-1 of the
107currently checked out commit for each submodule, along with the
Junio C Hamano1aa40d22010-01-21 17:46:43108submodule path and the output of 'git describe' for the
Junio C Hamano38b693c2007-06-03 08:40:14109SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
Junio C Hamano5cd15182011-04-05 00:21:10110initialized, `+` if the currently checked out submodule commit
Junio C Hamano38b693c2007-06-03 08:40:14111does not match the SHA-1 found in the index of the containing
Junio C Hamano5cd15182011-04-05 00:21:10112repository and `U` if the submodule has merge conflicts.
Junio C Hamano0e066b92009-08-28 01:08:41113+
Junio C Hamanoe1296e92011-08-08 22:58:15114If `--recursive` is specified, this command will recurse into nested
Junio C Hamano0e066b92009-08-28 01:08:41115submodules, and show their status as well.
Junio C Hamanoe1296e92011-08-08 22:58:15116+
117If you are only interested in changes of the currently initialized
118submodules with respect to the commit recorded in the index or the HEAD,
119linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
120too (and can also report changes to a submodule's work tree).
Junio C Hamano38b693c2007-06-03 08:40:14121
122init::
Junio C Hamano3d1b5a12013-05-17 23:34:02123Initialize the submodules recorded in the index (which were
124added and committed elsewhere) by copying submodule
125names and urls from .gitmodules to .git/config.
126Optional <path> arguments limit which submodules will be initialized.
Junio C Hamano58700662011-10-10 23:42:27127It will also copy the value of `submodule.$name.update` into
128.git/config.
Junio C Hamano915cd9b2008-07-20 01:24:17129The key used in .git/config is `submodule.$name.url`.
130This command does not alter existing information in .git/config.
131You can then customize the submodule clone URLs in .git/config
Junio C Hamano1aa40d22010-01-21 17:46:43132for your local setup and proceed to `git submodule update`;
133you can also just use `git submodule update --init` without
Junio C Hamano915cd9b2008-07-20 01:24:17134the explicit 'init' step if you do not intend to customize
135any submodule locations.
Junio C Hamano38b693c2007-06-03 08:40:14136
Junio C Hamano240dc3f2013-03-25 23:37:03137deinit::
138Unregister the given submodules, i.e. remove the whole
139`submodule.$name` section from .git/config together with their work
140tree. Further calls to `git submodule update`, `git submodule foreach`
141and `git submodule sync` will skip any unregistered submodules until
142they are initialized again, so use this command if you don't want to
143have a local checkout of the submodule in your work tree anymore. If
144you really want to remove a submodule from the repository and commit
145that use linkgit:git-rm[1] instead.
146+
147If `--force` is specified, the submodule's work tree will be removed even if
148it contains local modifications.
149
Junio C Hamano38b693c2007-06-03 08:40:14150update::
Junio C Hamano0f7b5a92008-05-17 06:12:23151+
Junio C Hamano6bf68cf2015-03-06 23:46:29152--
153Update the registered submodules to match what the superproject
154expects by cloning missing submodules and updating the working tree of
155the submodules. The "updating" can be done in several ways depending
156on command line options and the value of `submodule.<name>.update`
157configuration variable. Supported update procedures are:
158
159checkout;; the commit recorded in the superproject will be
160 checked out in the submodule on a detached HEAD. This is
161 done when `--checkout` option is given, or no option is
162 given, and `submodule.<name>.update` is unset, or if it is
163 set to 'checkout'.
164+
165If `--force` is specified, the submodule will be checked out (using
166`git checkout --force` if appropriate), even if the commit specified
167in the index of the containing repository already matches the commit
168checked out in the submodule.
169
170rebase;; the current branch of the submodule will be rebased
171 onto the commit recorded in the superproject. This is done
172 when `--rebase` option is given, or no option is given, and
173 `submodule.<name>.update` is set to 'rebase'.
174
175merge;; the commit recorded in the superproject will be merged
176 into the current branch in the submodule. This is done
177 when `--merge` option is given, or no option is given, and
178 `submodule.<name>.update` is set to 'merge'.
179
180custom command;; arbitrary shell command that takes a single
181 argument (the sha1 of the commit recorded in the
182 superproject) is executed. This is done when no option is
183 given, and `submodule.<name>.update` has the form of
184 '!command'.
185
186When no option is given and `submodule.<name>.update` is set to 'none',
187the submodule is not updated.
188
Junio C Hamano0f7b5a92008-05-17 06:12:23189If the submodule is not yet initialized, and you just want to use the
190setting as stored in .gitmodules, you can automatically initialize the
Junio C Hamanoe1296e92011-08-08 22:58:15191submodule with the `--init` option.
Junio C Hamano6bf68cf2015-03-06 23:46:29192
Junio C Hamanoe1296e92011-08-08 22:58:15193If `--recursive` is specified, this command will recurse into the
Junio C Hamano0e066b92009-08-28 01:08:41194registered submodules, and update any nested submodules within.
Junio C Hamano6bf68cf2015-03-06 23:46:29195--
Junio C Hamano8b588d52008-03-15 09:48:37196summary::
197Show commit summary between the given commit (defaults to HEAD) and
198working tree/index. For a submodule in question, a series of commits
199in the submodule between the given super project commit and the
Junio C Hamanoe1296e92011-08-08 22:58:15200index or working tree (switched by `--cached`) are shown. If the option
201`--files` is given, show the series of commits in the submodule between
Junio C Hamanoc276ec72009-08-26 01:35:22202the index of the super project and the working tree of the submodule
Junio C Hamanoe1296e92011-08-08 22:58:15203(this option doesn't allow to use the `--cached` option or to provide an
Junio C Hamanoc276ec72009-08-26 01:35:22204explicit commit).
Junio C Hamanoe1296e92011-08-08 22:58:15205+
206Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
207information too.
Junio C Hamano38b693c2007-06-03 08:40:14208
Junio C Hamano3f2f6e52008-08-21 10:34:22209foreach::
210Evaluates an arbitrary shell command in each checked out submodule.
Junio C Hamanoa574a092010-06-13 19:57:10211The command has access to the variables $name, $path, $sha1 and
212$toplevel:
Junio C Hamano0e066b92009-08-28 01:08:41213$name is the name of the relevant submodule section in .gitmodules,
Junio C Hamano3f2f6e52008-08-21 10:34:22214$path is the name of the submodule directory relative to the
Junio C Hamanoa574a092010-06-13 19:57:10215superproject, $sha1 is the commit as recorded in the superproject,
216and $toplevel is the absolute path to the top-level of the superproject.
Junio C Hamano3f2f6e52008-08-21 10:34:22217Any submodules defined in the superproject but not checked out are
Junio C Hamanoe1296e92011-08-08 22:58:15218ignored by this command. Unless given `--quiet`, foreach prints the name
Junio C Hamano3f2f6e52008-08-21 10:34:22219of each submodule before evaluating the command.
Junio C Hamanoe1296e92011-08-08 22:58:15220If `--recursive` is given, submodules are traversed recursively (i.e.
Junio C Hamano0e066b92009-08-28 01:08:41221the given shell command is evaluated in nested submodules as well).
Junio C Hamano3f2f6e52008-08-21 10:34:22222A non-zero return from the command in any submodule causes
223the processing to terminate. This can be overridden by adding '|| :'
224to the end of the command.
225+
Junio C Hamano73d812c2009-07-01 02:33:06226As an example, +git submodule foreach \'echo $path {backtick}git
227rev-parse HEAD{backtick}'+ will show the path and currently checked out
228commit for each submodule.
Junio C Hamano3f2f6e52008-08-21 10:34:22229
Junio C Hamanof9e04eb2008-08-28 02:50:50230sync::
231Synchronizes submodules' remote URL configuration setting
Junio C Hamano708376e2011-07-19 20:02:13232to the value specified in .gitmodules. It will only affect those
Junio C Hamano0ff98162012-03-31 18:19:09233submodules which already have a URL entry in .git/config (that is the
Junio C Hamano708376e2011-07-19 20:02:13234case when they are initialized or freshly added). This is useful when
Junio C Hamanof9e04eb2008-08-28 02:50:50235submodule URLs change upstream and you need to update your local
236repositories accordingly.
237+
238"git submodule sync" synchronizes all submodules while
Junio C Hamano360e3a12011-07-13 23:51:56239"git submodule sync \-- A" synchronizes submodule "A" only.
Junio C Hamano3f2f6e52008-08-21 10:34:22240
Junio C Hamano38b693c2007-06-03 08:40:14241OPTIONS
242-------
Junio C Hamanoeb415992008-06-08 22:49:47243-q::
244--quiet::
Junio C Hamano38b693c2007-06-03 08:40:14245Only print error messages.
246
Junio C Hamanoeb415992008-06-08 22:49:47247-b::
248--branch::
Junio C Hamano1d90cb02007-07-03 07:05:31249Branch of repository to add as submodule.
Junio C Hamano52b6ba32014-04-01 00:26:48250The name of the branch is recorded as `submodule.<name>.branch` in
Junio C Hamanoabad6da2013-01-06 09:06:32251`.gitmodules` for `update --remote`.
Junio C Hamano1d90cb02007-07-03 07:05:31252
Junio C Hamanoafabd322010-07-19 20:26:15253-f::
254--force::
Junio C Hamano240dc3f2013-03-25 23:37:03255This option is only valid for add, deinit and update commands.
Junio C Hamano60033462011-05-03 00:48:43256When running add, allow adding an otherwise ignored submodule path.
Junio C Hamano240dc3f2013-03-25 23:37:03257When running deinit the submodule work trees will be removed even if
258they contain local changes.
Junio C Hamano6bf68cf2015-03-06 23:46:29259When running update (only effective with the checkout procedure),
260throw away local changes in submodules when switching to a
261different commit; and always run a checkout operation in the
262submodule, even if the commit listed in the index of the
263containing repository matches the commit checked out in the
264submodule.
Junio C Hamanoafabd322010-07-19 20:26:15265
Junio C Hamano38b693c2007-06-03 08:40:14266--cached::
Junio C Hamano8b588d52008-03-15 09:48:37267This option is only valid for status and summary commands. These
268commands typically use the commit found in the submodule HEAD, but
269with this option, the commit stored in the index is used instead.
270
Junio C Hamanoc276ec72009-08-26 01:35:22271--files::
272This option is only valid for the summary command. This command
273compares the commit in the index with that in the submodule HEAD
274when this option is used.
275
Junio C Hamanoeb415992008-06-08 22:49:47276-n::
277--summary-limit::
Junio C Hamano8b588d52008-03-15 09:48:37278This option is only valid for the summary command.
279Limit the summary size (number of commits shown in total).
Junio C Hamano1bdd3b02008-04-13 05:33:18280Giving 0 will disable the summary; a negative number means unlimited
Junio C Hamano8b588d52008-03-15 09:48:37281(the default). This limit only applies to modified submodules. The
282size is always limited to 1 for added/deleted/typechanged submodules.
Junio C Hamano38b693c2007-06-03 08:40:14283
Junio C Hamanoabad6da2013-01-06 09:06:32284--remote::
285This option is only valid for the update command. Instead of using
286the superproject's recorded SHA-1 to update the submodule, use the
Junio C Hamano8401f142013-07-12 22:47:46287status of the submodule's remote-tracking branch. The remote used
Junio C Hamanoabad6da2013-01-06 09:06:32288is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
289The remote branch used defaults to `master`, but the branch name may
290be overridden by setting the `submodule.<name>.branch` option in
291either `.gitmodules` or `.git/config` (with `.git/config` taking
292precedence).
293+
294This works for any of the supported update procedures (`--checkout`,
295`--rebase`, etc.). The only change is the source of the target SHA-1.
296For example, `submodule update --remote --merge` will merge upstream
297submodule changes into the submodules, while `submodule update
298--merge` will merge superproject gitlink changes into the submodules.
299+
300In order to ensure a current tracking branch state, `update --remote`
301fetches the submodule's remote repository before calculating the
302SHA-1. If you don't want to fetch, you should use `submodule update
303--remote --no-fetch`.
Junio C Hamano5b3533d2014-02-27 23:07:15304+
305Use this option to integrate changes from the upstream subproject with
306your submodule's current HEAD. Alternatively, you can run `git pull`
307from the submodule, which is equivalent except for the remote branch
308name: `update --remote` uses the default upstream repository and
309`submodule.<name>.branch`, while `git pull` uses the submodule's
310`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want
311to distribute the default upstream branch with the superproject and
312`branch.<name>.merge` if you want a more native feel while working in
313the submodule itself.
Junio C Hamanoabad6da2013-01-06 09:06:32314
Junio C Hamano8bc410e2009-02-15 10:38:19315-N::
316--no-fetch::
317This option is only valid for the update command.
318Don't fetch new objects from the remote site.
319
Junio C Hamano81703b22014-03-14 22:00:27320--checkout::
321This option is only valid for the update command.
322Checkout the commit recorded in the superproject on a detached HEAD
323in the submodule. This is the default behavior, the main use of
324this option is to override `submodule.$name.update` when set to
Junio C Hamano6bf68cf2015-03-06 23:46:29325a value other than `checkout`.
Junio C Hamano81703b22014-03-14 22:00:27326If the key `submodule.$name.update` is either not explicitly set or
327set to `checkout`, this option is implicit.
328
Junio C Hamano0e88f3e2009-06-21 08:03:25329--merge::
330This option is only valid for the update command.
331Merge the commit recorded in the superproject into the current branch
332of the submodule. If this option is given, the submodule's HEAD will
333not be detached. If a merge failure prevents this process, you will
334have to resolve the resulting conflicts within the submodule with the
335usual conflict resolution tools.
336If the key `submodule.$name.update` is set to `merge`, this option is
337implicit.
338
Junio C Hamano25e7ba62009-06-14 01:03:22339--rebase::
340This option is only valid for the update command.
341Rebase the current branch onto the commit recorded in the
342superproject. If this option is given, the submodule's HEAD will not
Junio C Hamano167b1382010-01-31 23:04:31343be detached. If a merge failure prevents this process, you will have
Junio C Hamano25e7ba62009-06-14 01:03:22344to resolve these failures with linkgit:git-rebase[1].
345If the key `submodule.$name.update` is set to `rebase`, this option is
346implicit.
347
Junio C Hamanoe1296e92011-08-08 22:58:15348--init::
349This option is only valid for the update command.
350Initialize all submodules for which "git submodule init" has not been
351called so far before updating.
352
Junio C Hamanoa1295452012-11-13 22:32:04353--name::
354This option is only valid for the add command. It sets the submodule's
355name to the given string instead of defaulting to its path. The name
356must be valid as a directory name and may not end with a '/'.
357
Junio C Hamano7ae18252009-05-23 09:53:32358--reference <repository>::
359This option is only valid for add and update commands. These
360commands sometimes need to clone a remote repository. In this case,
361this option will be passed to the linkgit:git-clone[1] command.
362+
363*NOTE*: Do *not* use this option unless you have read the note
Junio C Hamanoe1296e92011-08-08 22:58:15364for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
Junio C Hamano7ae18252009-05-23 09:53:32365
Junio C Hamano0e066b92009-08-28 01:08:41366--recursive::
367This option is only valid for foreach, update and status commands.
368Traverse submodules recursively. The operation is performed not
369only in the submodules of the current repo, but also
370in any nested submodules inside those submodules (and so on).
371
Junio C Hamanoededf2b2013-07-15 21:11:16372--depth::
373This option is valid for add and update commands. Create a 'shallow'
374clone with a history truncated to the specified number of revisions.
375See linkgit:git-clone[1]
376
377
Junio C Hamano9e395072008-07-31 22:11:21378<path>...::
379Paths to submodule(s). When specified this will restrict the command
Junio C Hamano38b693c2007-06-03 08:40:14380to only operate on the submodules found at the specified paths.
Junio C Hamano38ddcce2008-07-15 15:49:03381(This argument is required with add).
Junio C Hamano38b693c2007-06-03 08:40:14382
383FILES
384-----
Junio C Hamano16f98872007-06-12 16:09:14385When initializing submodules, a .gitmodules file in the top-level directory
Junio C Hamano38b693c2007-06-03 08:40:14386of the containing repository is used to find the url of each submodule.
Junio C Hamano91baf102007-12-31 09:44:26387This file should be formatted in the same way as `$GIT_DIR/config`. The key
Junio C Hamano35738e82008-01-07 07:55:46388to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
Junio C Hamanoe66c6c02007-12-17 08:26:13389for details.
Junio C Hamano38b693c2007-06-03 08:40:14390
Junio C Hamano38b693c2007-06-03 08:40:14391GIT
392---
Junio C Hamanof7c042d2008-06-06 22:50:53393Part of the linkgit:git[1] suite