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