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