git-submodule.txt 20 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457
  1. git-submodule(1)
  2. ================
  3. NAME
  4. ----
  5. git-submodule - Initialize, update or inspect submodules
  6. SYNOPSIS
  7. --------
  8. [verse]
  9. 'git submodule' [--quiet] [--cached]
  10. 'git submodule' [--quiet] add [<options>] [--] <repository> [<path>]
  11. 'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...]
  12. 'git submodule' [--quiet] init [--] [<path>...]
  13. 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
  14. 'git submodule' [--quiet] update [<options>] [--] [<path>...]
  15. 'git submodule' [--quiet] set-branch [<options>] [--] <path>
  16. 'git submodule' [--quiet] set-url [--] <path> <newurl>
  17. 'git submodule' [--quiet] summary [<options>] [--] [<path>...]
  18. 'git submodule' [--quiet] foreach [--recursive] <command>
  19. 'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
  20. 'git submodule' [--quiet] absorbgitdirs [--] [<path>...]
  21. DESCRIPTION
  22. -----------
  23. Inspects, updates and manages submodules.
  24. For more information about submodules, see linkgit:gitsubmodules[7].
  25. COMMANDS
  26. --------
  27. With no arguments, shows the status of existing submodules. Several
  28. subcommands are available to perform operations on the submodules.
  29. add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]::
  30. Add the given repository as a submodule at the given path
  31. to the changeset to be committed next to the current
  32. project: the current project is termed the "superproject".
  33. +
  34. <repository> is the URL of the new submodule's origin repository.
  35. This may be either an absolute URL, or (if it begins with ./
  36. or ../), the location relative to the superproject's default remote
  37. repository (Please note that to specify a repository 'foo.git'
  38. which is located right next to a superproject 'bar.git', you'll
  39. have to use `../foo.git` instead of `./foo.git` - as one might expect
  40. when following the rules for relative URLs - because the evaluation
  41. of relative URLs in Git is identical to that of relative directories).
  42. +
  43. The default remote is the remote of the remote-tracking branch
  44. of the current branch. If no such remote-tracking branch exists or
  45. the HEAD is detached, "origin" is assumed to be the default remote.
  46. If the superproject doesn't have a default remote configured
  47. the superproject is its own authoritative upstream and the current
  48. working directory is used instead.
  49. +
  50. The optional argument <path> is the relative location for the cloned
  51. submodule to exist in the superproject. If <path> is not given, the
  52. canonical part of the source repository is used ("repo" for
  53. "/path/to/repo.git" and "foo" for "host.xz:foo/.git"). If <path>
  54. exists and is already a valid Git repository, then it is staged
  55. for commit without cloning. The <path> is also used as the submodule's
  56. logical name in its configuration entries unless `--name` is used
  57. to specify a logical name.
  58. +
  59. The given URL is recorded into `.gitmodules` for use by subsequent users
  60. cloning the superproject. If the URL is given relative to the
  61. superproject's repository, the presumption is the superproject and
  62. submodule repositories will be kept together in the same relative
  63. location, and only the superproject's URL needs to be provided.
  64. git-submodule will correctly locate the submodule using the relative
  65. URL in `.gitmodules`.
  66. status [--cached] [--recursive] [--] [<path>...]::
  67. Show the status of the submodules. This will print the SHA-1 of the
  68. currently checked out commit for each submodule, along with the
  69. submodule path and the output of 'git describe' for the
  70. SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is
  71. not initialized, `+` if the currently checked out submodule commit
  72. does not match the SHA-1 found in the index of the containing
  73. repository and `U` if the submodule has merge conflicts.
  74. +
  75. If `--cached` is specified, this command will instead print the SHA-1
  76. recorded in the superproject for each submodule.
  77. +
  78. If `--recursive` is specified, this command will recurse into nested
  79. submodules, and show their status as well.
  80. +
  81. If you are only interested in changes of the currently initialized
  82. submodules with respect to the commit recorded in the index or the HEAD,
  83. linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
  84. too (and can also report changes to a submodule's work tree).
  85. init [--] [<path>...]::
  86. Initialize the submodules recorded in the index (which were
  87. added and committed elsewhere) by setting `submodule.$name.url`
  88. in .git/config. It uses the same setting from `.gitmodules` as
  89. a template. If the URL is relative, it will be resolved using
  90. the default remote. If there is no default remote, the current
  91. repository will be assumed to be upstream.
  92. +
  93. Optional <path> arguments limit which submodules will be initialized.
  94. If no path is specified and submodule.active has been configured, submodules
  95. configured to be active will be initialized, otherwise all submodules are
  96. initialized.
  97. +
  98. When present, it will also copy the value of `submodule.$name.update`.
  99. This command does not alter existing information in .git/config.
  100. You can then customize the submodule clone URLs in .git/config
  101. for your local setup and proceed to `git submodule update`;
  102. you can also just use `git submodule update --init` without
  103. the explicit 'init' step if you do not intend to customize
  104. any submodule locations.
  105. +
  106. See the add subcommand for the definition of default remote.
  107. deinit [-f|--force] (--all|[--] <path>...)::
  108. Unregister the given submodules, i.e. remove the whole
  109. `submodule.$name` section from .git/config together with their work
  110. tree. Further calls to `git submodule update`, `git submodule foreach`
  111. and `git submodule sync` will skip any unregistered submodules until
  112. they are initialized again, so use this command if you don't want to
  113. have a local checkout of the submodule in your working tree anymore.
  114. +
  115. When the command is run without pathspec, it errors out,
  116. instead of deinit-ing everything, to prevent mistakes.
  117. +
  118. If `--force` is specified, the submodule's working tree will
  119. be removed even if it contains local modifications.
  120. +
  121. If you really want to remove a submodule from the repository and commit
  122. that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
  123. options.
  124. update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
  125. +
  126. --
  127. Update the registered submodules to match what the superproject
  128. expects by cloning missing submodules, fetching missing commits
  129. in submodules and updating the working tree of
  130. the submodules. The "updating" can be done in several ways depending
  131. on command line options and the value of `submodule.<name>.update`
  132. configuration variable. The command line option takes precedence over
  133. the configuration variable. If neither is given, a 'checkout' is performed.
  134. The 'update' procedures supported both from the command line as well as
  135. through the `submodule.<name>.update` configuration are:
  136. checkout;; the commit recorded in the superproject will be
  137. checked out in the submodule on a detached HEAD.
  138. +
  139. If `--force` is specified, the submodule will be checked out (using
  140. `git checkout --force`), even if the commit specified
  141. in the index of the containing repository already matches the commit
  142. checked out in the submodule.
  143. rebase;; the current branch of the submodule will be rebased
  144. onto the commit recorded in the superproject.
  145. merge;; the commit recorded in the superproject will be merged
  146. into the current branch in the submodule.
  147. The following 'update' procedures are only available via the
  148. `submodule.<name>.update` configuration variable:
  149. custom command;; arbitrary shell command that takes a single
  150. argument (the sha1 of the commit recorded in the
  151. superproject) is executed. When `submodule.<name>.update`
  152. is set to '!command', the remainder after the exclamation mark
  153. is the custom command.
  154. none;; the submodule is not updated.
  155. If the submodule is not yet initialized, and you just want to use the
  156. setting as stored in `.gitmodules`, you can automatically initialize the
  157. submodule with the `--init` option.
  158. If `--recursive` is specified, this command will recurse into the
  159. registered submodules, and update any nested submodules within.
  160. --
  161. set-branch (-b|--branch) <branch> [--] <path>::
  162. set-branch (-d|--default) [--] <path>::
  163. Sets the default remote tracking branch for the submodule. The
  164. `--branch` option allows the remote branch to be specified. The
  165. `--default` option removes the submodule.<name>.branch configuration
  166. key, which causes the tracking branch to default to the remote 'HEAD'.
  167. set-url [--] <path> <newurl>::
  168. Sets the URL of the specified submodule to <newurl>. Then, it will
  169. automatically synchronize the submodule's new remote URL
  170. configuration.
  171. summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
  172. Show commit summary between the given commit (defaults to HEAD) and
  173. working tree/index. For a submodule in question, a series of commits
  174. in the submodule between the given super project commit and the
  175. index or working tree (switched by `--cached`) are shown. If the option
  176. `--files` is given, show the series of commits in the submodule between
  177. the index of the super project and the working tree of the submodule
  178. (this option doesn't allow to use the `--cached` option or to provide an
  179. explicit commit).
  180. +
  181. Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
  182. information too.
  183. foreach [--recursive] <command>::
  184. Evaluates an arbitrary shell command in each checked out submodule.
  185. The command has access to the variables $name, $sm_path, $displaypath,
  186. $sha1 and $toplevel:
  187. $name is the name of the relevant submodule section in `.gitmodules`,
  188. $sm_path is the path of the submodule as recorded in the immediate
  189. superproject, $displaypath contains the relative path from the
  190. current working directory to the submodules root directory,
  191. $sha1 is the commit as recorded in the immediate
  192. superproject, and $toplevel is the absolute path to the top-level
  193. of the immediate superproject.
  194. Note that to avoid conflicts with '$PATH' on Windows, the '$path'
  195. variable is now a deprecated synonym of '$sm_path' variable.
  196. Any submodules defined in the superproject but not checked out are
  197. ignored by this command. Unless given `--quiet`, foreach prints the name
  198. of each submodule before evaluating the command.
  199. If `--recursive` is given, submodules are traversed recursively (i.e.
  200. the given shell command is evaluated in nested submodules as well).
  201. A non-zero return from the command in any submodule causes
  202. the processing to terminate. This can be overridden by adding '|| :'
  203. to the end of the command.
  204. +
  205. As an example, the command below will show the path and currently
  206. checked out commit for each submodule:
  207. +
  208. --------------
  209. git submodule foreach 'echo $sm_path `git rev-parse HEAD`'
  210. --------------
  211. sync [--recursive] [--] [<path>...]::
  212. Synchronizes submodules' remote URL configuration setting
  213. to the value specified in `.gitmodules`. It will only affect those
  214. submodules which already have a URL entry in .git/config (that is the
  215. case when they are initialized or freshly added). This is useful when
  216. submodule URLs change upstream and you need to update your local
  217. repositories accordingly.
  218. +
  219. `git submodule sync` synchronizes all submodules while
  220. `git submodule sync -- A` synchronizes submodule "A" only.
  221. +
  222. If `--recursive` is specified, this command will recurse into the
  223. registered submodules, and sync any nested submodules within.
  224. absorbgitdirs::
  225. If a git directory of a submodule is inside the submodule,
  226. move the git directory of the submodule into its superproject's
  227. `$GIT_DIR/modules` path and then connect the git directory and
  228. its working directory by setting the `core.worktree` and adding
  229. a .git file pointing to the git directory embedded in the
  230. superprojects git directory.
  231. +
  232. A repository that was cloned independently and later added as a submodule or
  233. old setups have the submodules git directory inside the submodule instead of
  234. embedded into the superprojects git directory.
  235. +
  236. This command is recursive by default.
  237. OPTIONS
  238. -------
  239. -q::
  240. --quiet::
  241. Only print error messages.
  242. --progress::
  243. This option is only valid for add and update commands.
  244. Progress status is reported on the standard error stream
  245. by default when it is attached to a terminal, unless -q
  246. is specified. This flag forces progress status even if the
  247. standard error stream is not directed to a terminal.
  248. --all::
  249. This option is only valid for the deinit command. Unregister all
  250. submodules in the working tree.
  251. -b <branch>::
  252. --branch <branch>::
  253. Branch of repository to add as submodule.
  254. The name of the branch is recorded as `submodule.<name>.branch` in
  255. `.gitmodules` for `update --remote`. A special value of `.` is used to
  256. indicate that the name of the branch in the submodule should be the
  257. same name as the current branch in the current repository. If the
  258. option is not specified, it defaults to the remote 'HEAD'.
  259. -f::
  260. --force::
  261. This option is only valid for add, deinit and update commands.
  262. When running add, allow adding an otherwise ignored submodule path.
  263. When running deinit the submodule working trees will be removed even
  264. if they contain local changes.
  265. When running update (only effective with the checkout procedure),
  266. throw away local changes in submodules when switching to a
  267. different commit; and always run a checkout operation in the
  268. submodule, even if the commit listed in the index of the
  269. containing repository matches the commit checked out in the
  270. submodule.
  271. --cached::
  272. This option is only valid for status and summary commands. These
  273. commands typically use the commit found in the submodule HEAD, but
  274. with this option, the commit stored in the index is used instead.
  275. --files::
  276. This option is only valid for the summary command. This command
  277. compares the commit in the index with that in the submodule HEAD
  278. when this option is used.
  279. -n::
  280. --summary-limit::
  281. This option is only valid for the summary command.
  282. Limit the summary size (number of commits shown in total).
  283. Giving 0 will disable the summary; a negative number means unlimited
  284. (the default). This limit only applies to modified submodules. The
  285. size is always limited to 1 for added/deleted/typechanged submodules.
  286. --remote::
  287. This option is only valid for the update command. Instead of using
  288. the superproject's recorded SHA-1 to update the submodule, use the
  289. status of the submodule's remote-tracking branch. The remote used
  290. is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
  291. The remote branch used defaults to the remote `HEAD`, but the branch
  292. name may be overridden by setting the `submodule.<name>.branch`
  293. option in either `.gitmodules` or `.git/config` (with `.git/config`
  294. taking precedence).
  295. +
  296. This works for any of the supported update procedures (`--checkout`,
  297. `--rebase`, etc.). The only change is the source of the target SHA-1.
  298. For example, `submodule update --remote --merge` will merge upstream
  299. submodule changes into the submodules, while `submodule update
  300. --merge` will merge superproject gitlink changes into the submodules.
  301. +
  302. In order to ensure a current tracking branch state, `update --remote`
  303. fetches the submodule's remote repository before calculating the
  304. SHA-1. If you don't want to fetch, you should use `submodule update
  305. --remote --no-fetch`.
  306. +
  307. Use this option to integrate changes from the upstream subproject with
  308. your submodule's current HEAD. Alternatively, you can run `git pull`
  309. from the submodule, which is equivalent except for the remote branch
  310. name: `update --remote` uses the default upstream repository and
  311. `submodule.<name>.branch`, while `git pull` uses the submodule's
  312. `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want
  313. to distribute the default upstream branch with the superproject and
  314. `branch.<name>.merge` if you want a more native feel while working in
  315. the submodule itself.
  316. -N::
  317. --no-fetch::
  318. This option is only valid for the update command.
  319. Don't fetch new objects from the remote site.
  320. --checkout::
  321. This option is only valid for the update command.
  322. Checkout the commit recorded in the superproject on a detached HEAD
  323. in the submodule. This is the default behavior, the main use of
  324. this option is to override `submodule.$name.update` when set to
  325. a value other than `checkout`.
  326. If the key `submodule.$name.update` is either not explicitly set or
  327. set to `checkout`, this option is implicit.
  328. --merge::
  329. This option is only valid for the update command.
  330. Merge the commit recorded in the superproject into the current branch
  331. of the submodule. If this option is given, the submodule's HEAD will
  332. not be detached. If a merge failure prevents this process, you will
  333. have to resolve the resulting conflicts within the submodule with the
  334. usual conflict resolution tools.
  335. If the key `submodule.$name.update` is set to `merge`, this option is
  336. implicit.
  337. --rebase::
  338. This option is only valid for the update command.
  339. Rebase the current branch onto the commit recorded in the
  340. superproject. If this option is given, the submodule's HEAD will not
  341. be detached. If a merge failure prevents this process, you will have
  342. to resolve these failures with linkgit:git-rebase[1].
  343. If the key `submodule.$name.update` is set to `rebase`, this option is
  344. implicit.
  345. --init::
  346. This option is only valid for the update command.
  347. Initialize all submodules for which "git submodule init" has not been
  348. called so far before updating.
  349. --name::
  350. This option is only valid for the add command. It sets the submodule's
  351. name to the given string instead of defaulting to its path. The name
  352. must be valid as a directory name and may not end with a '/'.
  353. --reference <repository>::
  354. This option is only valid for add and update commands. These
  355. commands sometimes need to clone a remote repository. In this case,
  356. this option will be passed to the linkgit:git-clone[1] command.
  357. +
  358. *NOTE*: Do *not* use this option unless you have read the note
  359. for linkgit:git-clone[1]'s `--reference`, `--shared`, and `--dissociate`
  360. options carefully.
  361. --dissociate::
  362. This option is only valid for add and update commands. These
  363. commands sometimes need to clone a remote repository. In this case,
  364. this option will be passed to the linkgit:git-clone[1] command.
  365. +
  366. *NOTE*: see the NOTE for the `--reference` option.
  367. --recursive::
  368. This option is only valid for foreach, update, status and sync commands.
  369. Traverse submodules recursively. The operation is performed not
  370. only in the submodules of the current repo, but also
  371. in any nested submodules inside those submodules (and so on).
  372. --depth::
  373. This option is valid for add and update commands. Create a 'shallow'
  374. clone with a history truncated to the specified number of revisions.
  375. See linkgit:git-clone[1]
  376. --[no-]recommend-shallow::
  377. This option is only valid for the update command.
  378. The initial clone of a submodule will use the recommended
  379. `submodule.<name>.shallow` as provided by the `.gitmodules` file
  380. by default. To ignore the suggestions use `--no-recommend-shallow`.
  381. -j <n>::
  382. --jobs <n>::
  383. This option is only valid for the update command.
  384. Clone new submodules in parallel with as many jobs.
  385. Defaults to the `submodule.fetchJobs` option.
  386. --[no-]single-branch::
  387. This option is only valid for the update command.
  388. Clone only one branch during update: HEAD or one specified by --branch.
  389. <path>...::
  390. Paths to submodule(s). When specified this will restrict the command
  391. to only operate on the submodules found at the specified paths.
  392. (This argument is required with add).
  393. FILES
  394. -----
  395. When initializing submodules, a `.gitmodules` file in the top-level directory
  396. of the containing repository is used to find the url of each submodule.
  397. This file should be formatted in the same way as `$GIT_DIR/config`. The key
  398. to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5]
  399. for details.
  400. SEE ALSO
  401. --------
  402. linkgit:gitsubmodules[7], linkgit:gitmodules[5].
  403. GIT
  404. ---
  405. Part of the linkgit:git[1] suite