]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-submodule.txt
Merge branch 'js/maint-remote-remove-mirror'
[thirdparty/git.git] / Documentation / git-submodule.txt
CommitLineData
70c7ac22
LH
1git-submodule(1)
2================
3
4NAME
5----
6git-submodule - Initialize, update or inspect submodules
7
8
9SYNOPSIS
10--------
b2493649 11[verse]
ec05df35 12'git submodule' [--quiet] add [-b branch] [--] <repository> <path>
b1889c36
JN
13'git submodule' [--quiet] status [--cached] [--] [<path>...]
14'git submodule' [--quiet] init [--] [<path>...]
15'git submodule' [--quiet] update [--init] [--] [<path>...]
16'git submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
19a31f9c 17'git submodule' [--quiet] foreach <command>
2327f61e 18'git submodule' [--quiet] sync [--] [<path>...]
70c7ac22
LH
19
20
e38953ab
PB
21DESCRIPTION
22-----------
c47f1024
PB
23Submodules allow foreign repositories to be embedded within
24a dedicated subdirectory of the source tree, always pointed
25at a particular commit.
26
27They are not to be confused with remotes, which are meant mainly
28for branches of the same project; submodules are meant for
29different projects you would like to make part of your source tree,
30while the history of the two projects still stays completely
31independent and you cannot modify the contents of the submodule
32from within the main project.
33If you want to merge the project histories and want to treat the
34aggregated whole as a single project from then on, you may want to
35add a remote for the other project and use the 'subtree' merge strategy,
36instead of treating the other project as a submodule. Directories
37that come from both projects can be cloned and checked out as a whole
38if you choose to go that route.
39
40Submodules 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.
43A record in the `.gitmodules` file at the root of the source
44tree assigns a logical name to the submodule and describes
45the default URL the submodule shall be cloned from.
46The logical name can be used for overriding this URL within your
47local repository configuration (see 'submodule init').
48
49This command will manage the tree entries and contents of the
50gitmodules file for you, as well as inspect the status of your
51submodules and update them.
52When adding a new submodule to the tree, the 'add' subcommand
53is to be used. However, when pulling a tree containing submodules,
54these will not be checked out by default;
55the 'init' and 'update' subcommands will maintain submodules
56checked out and at appropriate revision in your working tree.
57You can briefly inspect the up-to-date status of your submodules
58using the 'status' subcommand and get a detailed overview of the
59difference between the index and checkouts using the 'summary'
60subcommand.
e38953ab
PB
61
62
70c7ac22
LH
63COMMANDS
64--------
ecda0723
SV
65add::
66 Add the given repository as a submodule at the given path
ec05df35 67 to the changeset to be committed next to the current
77ef80a8 68 project: the current project is termed the "superproject".
ec05df35
ML
69+
70This requires two arguments: <repository> and <path>.
71+
72<repository> is the URL of the new submodule's origin repository.
73This may be either an absolute URL, or (if it begins with ./
74or ../), the location relative to the superproject's origin
75repository.
76+
77<path> is the relative location for the cloned submodule to
78exist in the superproject. If <path> does not exist, then the
79submodule is created by cloning from the named URL. If <path> does
80exist and is already a valid git repository, then this is added
81to the changeset without cloning. This second form is provided
82to ease creating a new submodule from scratch, and presumes
83the user will later push the submodule to the given URL.
84+
85In either case, the given URL is recorded into .gitmodules for
86use by subsequent users cloning the superproject. If the URL is
87given relative to the superproject's repository, the presumption
88is the superproject and submodule repositories will be kept
89together in the same relative location, and only the
04c8ce9c 90superproject's URL needs to be provided: git-submodule will correctly
ec05df35 91locate the submodule using the relative URL in .gitmodules.
ecda0723 92
70c7ac22
LH
93status::
94 Show the status of the submodules. This will print the SHA-1 of the
95 currently checked out commit for each submodule, along with the
ba020ef5 96 submodule path and the output of 'git-describe' for the
70c7ac22
LH
97 SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
98 initialized and `+` if the currently checked out submodule commit
99 does not match the SHA-1 found in the index of the containing
ba020ef5 100 repository. This command is the default command for 'git-submodule'.
70c7ac22
LH
101
102init::
c47f1024
PB
103 Initialize the submodules, i.e. register each submodule name
104 and url found in .gitmodules into .git/config.
105 The key used in .git/config is `submodule.$name.url`.
106 This command does not alter existing information in .git/config.
107 You can then customize the submodule clone URLs in .git/config
108 for your local setup and proceed to 'git submodule update';
109 you can also just use 'git submodule update --init' without
110 the explicit 'init' step if you do not intend to customize
111 any submodule locations.
70c7ac22
LH
112
113update::
211b7f19
LH
114 Update the registered submodules, i.e. clone missing submodules and
115 checkout the commit specified in the index of the containing repository.
116 This will make the submodules HEAD be detached.
be4d2c83
JS
117+
118If the submodule is not yet initialized, and you just want to use the
119setting as stored in .gitmodules, you can automatically initialize the
120submodule with the --init option.
70c7ac22 121
925e7f62
PY
122summary::
123 Show commit summary between the given commit (defaults to HEAD) and
124 working tree/index. For a submodule in question, a series of commits
125 in the submodule between the given super project commit and the
126 index or working tree (switched by --cached) are shown.
70c7ac22 127
19a31f9c
ML
128foreach::
129 Evaluates an arbitrary shell command in each checked out submodule.
130 The command has access to the variables $path and $sha1:
131 $path is the name of the submodule directory relative to the
132 superproject, and $sha1 is the commit as recorded in the superproject.
133 Any submodules defined in the superproject but not checked out are
134 ignored by this command. Unless given --quiet, foreach prints the name
135 of each submodule before evaluating the command.
136 A non-zero return from the command in any submodule causes
137 the processing to terminate. This can be overridden by adding '|| :'
138 to the end of the command.
139+
140As an example, "git submodule foreach 'echo $path `git rev-parse HEAD`' will
141show the path and currently checked out commit for each submodule.
142
2327f61e
DA
143sync::
144 Synchronizes submodules' remote URL configuration setting
145 to the value specified in .gitmodules. This is useful when
146 submodule URLs change upstream and you need to update your local
147 repositories accordingly.
148+
149"git submodule sync" synchronizes all submodules while
150"git submodule sync -- A" synchronizes submodule "A" only.
19a31f9c 151
70c7ac22
LH
152OPTIONS
153-------
3240240f
SB
154-q::
155--quiet::
70c7ac22
LH
156 Only print error messages.
157
3240240f
SB
158-b::
159--branch::
ecda0723
SV
160 Branch of repository to add as submodule.
161
70c7ac22 162--cached::
925e7f62
PY
163 This option is only valid for status and summary commands. These
164 commands typically use the commit found in the submodule HEAD, but
165 with this option, the commit stored in the index is used instead.
166
3240240f
SB
167-n::
168--summary-limit::
925e7f62
PY
169 This option is only valid for the summary command.
170 Limit the summary size (number of commits shown in total).
51836e9e 171 Giving 0 will disable the summary; a negative number means unlimited
925e7f62
PY
172 (the default). This limit only applies to modified submodules. The
173 size is always limited to 1 for added/deleted/typechanged submodules.
70c7ac22 174
f448e24e
AMS
175<path>...::
176 Paths to submodule(s). When specified this will restrict the command
70c7ac22 177 to only operate on the submodules found at the specified paths.
ec05df35 178 (This argument is required with add).
70c7ac22
LH
179
180FILES
181-----
211b7f19 182When initializing submodules, a .gitmodules file in the top-level directory
70c7ac22 183of the containing repository is used to find the url of each submodule.
c4585701 184This file should be formatted in the same way as `$GIT_DIR/config`. The key
5162e697 185to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
6fbe42c7 186for details.
70c7ac22
LH
187
188
189AUTHOR
190------
191Written by Lars Hjemli <hjemli@gmail.com>
192
193GIT
194---
9e1f0a85 195Part of the linkgit:git[1] suite