Documentation / git-submodule.txton commit Merge branch 'js/rebase-i-dedup-call-to-rerere' (7267404)
   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 [-b <branch>] [-f|--force] [--name <name>]
  13              [--reference <repository>] [--depth <depth>] [--] <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 [--init] [--remote] [-N|--no-fetch]
  18              [-f|--force] [--rebase|--merge] [--reference <repository>]
  19              [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]
  20'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>]
  21              [commit] [--] [<path>...]
  22'git submodule' [--quiet] foreach [--recursive] <command>
  23'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
  24
  25
  26DESCRIPTION
  27-----------
  28Inspects, updates and manages submodules.
  29
  30A 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.
  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` (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.
  46The logical name can be used for overriding this URL within your
  47local repository configuration (see 'submodule init').
  48
  49Submodules 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.
  61
  62COMMANDS
  63--------
  64add::
  65        Add the given repository as a submodule at the given path
  66        to the changeset to be committed next to the current
  67        project: the current project is termed the "superproject".
  68+
  69This 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").
  74The <path> is also used as the submodule's logical name in its
  75configuration entries unless `--name` is used to specify a logical name.
  76+
  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
  80repository (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
  86the superproject is its own authoritative upstream and the current
  87working directory is used instead.
  88+
  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
  92exist and is already a valid Git repository, then this is added
  93to 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
 102superproject's URL needs to be provided: git-submodule will correctly
 103locate the submodule using the relative URL in .gitmodules.
 104
 105status::
 106        Show the status of the submodules. This will print the SHA-1 of the
 107        currently checked out commit for each submodule, along with the
 108        submodule path and the output of 'git describe' for the
 109        SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
 110        initialized, `+` if the currently checked out submodule commit
 111        does not match the SHA-1 found in the index of the containing
 112        repository and `U` if the submodule has merge conflicts.
 113+
 114If `--recursive` is specified, this command will recurse into nested
 115submodules, and show their status as well.
 116+
 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).
 121
 122init::
 123        Initialize the submodules recorded in the index (which were
 124        added and committed elsewhere) by copying submodule
 125        names and urls from .gitmodules to .git/config.
 126        Optional <path> arguments limit which submodules will be initialized.
 127        It will also copy the value of `submodule.$name.update` into
 128        .git/config.
 129        The key used in .git/config is `submodule.$name.url`.
 130        This command does not alter existing information in .git/config.
 131        You can then customize the submodule clone URLs in .git/config
 132        for your local setup and proceed to `git submodule update`;
 133        you can also just use `git submodule update --init` without
 134        the explicit 'init' step if you do not intend to customize
 135        any submodule locations.
 136
 137deinit::
 138        Unregister the given submodules, i.e. remove the whole
 139        `submodule.$name` section from .git/config together with their work
 140        tree. Further calls to `git submodule update`, `git submodule foreach`
 141        and `git submodule sync` will skip any unregistered submodules until
 142        they are initialized again, so use this command if you don't want to
 143        have a local checkout of the submodule in your working tree anymore. If
 144        you really want to remove a submodule from the repository and commit
 145        that use linkgit:git-rm[1] instead.
 146+
 147When the command is run without pathspec, it errors out,
 148instead of deinit-ing everything, to prevent mistakes.
 149+
 150If `--force` is specified, the submodule's working tree will
 151be removed even if it contains local modifications.
 152
 153update::
 154+
 155--
 156Update the registered submodules to match what the superproject
 157expects by cloning missing submodules and updating the working tree of
 158the submodules. The "updating" can be done in several ways depending
 159on command line options and the value of `submodule.<name>.update`
 160configuration variable. Supported update procedures are:
 161
 162        checkout;; the commit recorded in the superproject will be
 163            checked out in the submodule on a detached HEAD. This is
 164            done when `--checkout` option is given, or no option is
 165            given, and `submodule.<name>.update` is unset, or if it is
 166            set to 'checkout'.
 167+
 168If `--force` is specified, the submodule will be checked out (using
 169`git checkout --force` if appropriate), even if the commit specified
 170in the index of the containing repository already matches the commit
 171checked out in the submodule.
 172
 173        rebase;; the current branch of the submodule will be rebased
 174            onto the commit recorded in the superproject. This is done
 175            when `--rebase` option is given, or no option is given, and
 176            `submodule.<name>.update` is set to 'rebase'.
 177
 178        merge;; the commit recorded in the superproject will be merged
 179            into the current branch in the submodule. This is done
 180            when `--merge` option is given, or no option is given, and
 181            `submodule.<name>.update` is set to 'merge'.
 182
 183        custom command;; arbitrary shell command that takes a single
 184            argument (the sha1 of the commit recorded in the
 185            superproject) is executed. This is done when no option is
 186            given, and `submodule.<name>.update` has the form of
 187            '!command'.
 188
 189When no option is given and `submodule.<name>.update` is set to 'none',
 190the submodule is not updated.
 191
 192If the submodule is not yet initialized, and you just want to use the
 193setting as stored in .gitmodules, you can automatically initialize the
 194submodule with the `--init` option.
 195
 196If `--recursive` is specified, this command will recurse into the
 197registered submodules, and update any nested submodules within.
 198--
 199summary::
 200        Show commit summary between the given commit (defaults to HEAD) and
 201        working tree/index. For a submodule in question, a series of commits
 202        in the submodule between the given super project commit and the
 203        index or working tree (switched by `--cached`) are shown. If the option
 204        `--files` is given, show the series of commits in the submodule between
 205        the index of the super project and the working tree of the submodule
 206        (this option doesn't allow to use the `--cached` option or to provide an
 207        explicit commit).
 208+
 209Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
 210information too.
 211
 212foreach::
 213        Evaluates an arbitrary shell command in each checked out submodule.
 214        The command has access to the variables $name, $path, $sha1 and
 215        $toplevel:
 216        $name is the name of the relevant submodule section in .gitmodules,
 217        $path is the name of the submodule directory relative to the
 218        superproject, $sha1 is the commit as recorded in the superproject,
 219        and $toplevel is the absolute path to the top-level of the superproject.
 220        Any submodules defined in the superproject but not checked out are
 221        ignored by this command. Unless given `--quiet`, foreach prints the name
 222        of each submodule before evaluating the command.
 223        If `--recursive` is given, submodules are traversed recursively (i.e.
 224        the given shell command is evaluated in nested submodules as well).
 225        A non-zero return from the command in any submodule causes
 226        the processing to terminate. This can be overridden by adding '|| :'
 227        to the end of the command.
 228+
 229As an example, +git submodule foreach \'echo $path {backtick}git
 230rev-parse HEAD{backtick}'+ will show the path and currently checked out
 231commit for each submodule.
 232
 233sync::
 234        Synchronizes submodules' remote URL configuration setting
 235        to the value specified in .gitmodules. It will only affect those
 236        submodules which already have a URL entry in .git/config (that is the
 237        case when they are initialized or freshly added). This is useful when
 238        submodule URLs change upstream and you need to update your local
 239        repositories accordingly.
 240+
 241"git submodule sync" synchronizes all submodules while
 242"git submodule sync \-- A" synchronizes submodule "A" only.
 243+
 244If `--recursive` is specified, this command will recurse into the
 245registered submodules, and sync any nested submodules within.
 246
 247OPTIONS
 248-------
 249-q::
 250--quiet::
 251        Only print error messages.
 252
 253--all::
 254        This option is only valid for the deinit command. Unregister all
 255        submodules in the working tree.
 256
 257-b::
 258--branch::
 259        Branch of repository to add as submodule.
 260        The name of the branch is recorded as `submodule.<name>.branch` in
 261        `.gitmodules` for `update --remote`.
 262
 263-f::
 264--force::
 265        This option is only valid for add, deinit and update commands.
 266        When running add, allow adding an otherwise ignored submodule path.
 267        When running deinit the submodule working trees will be removed even
 268        if they contain local changes.
 269        When running update (only effective with the checkout procedure),
 270        throw away local changes in submodules when switching to a
 271        different commit; and always run a checkout operation in the
 272        submodule, even if the commit listed in the index of the
 273        containing repository matches the commit checked out in the
 274        submodule.
 275
 276--cached::
 277        This option is only valid for status and summary commands.  These
 278        commands typically use the commit found in the submodule HEAD, but
 279        with this option, the commit stored in the index is used instead.
 280
 281--files::
 282        This option is only valid for the summary command. This command
 283        compares the commit in the index with that in the submodule HEAD
 284        when this option is used.
 285
 286-n::
 287--summary-limit::
 288        This option is only valid for the summary command.
 289        Limit the summary size (number of commits shown in total).
 290        Giving 0 will disable the summary; a negative number means unlimited
 291        (the default). This limit only applies to modified submodules. The
 292        size is always limited to 1 for added/deleted/typechanged submodules.
 293
 294--remote::
 295        This option is only valid for the update command.  Instead of using
 296        the superproject's recorded SHA-1 to update the submodule, use the
 297        status of the submodule's remote-tracking branch.  The remote used
 298        is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
 299        The remote branch used defaults to `master`, but the branch name may
 300        be overridden by setting the `submodule.<name>.branch` option in
 301        either `.gitmodules` or `.git/config` (with `.git/config` taking
 302        precedence).
 303+
 304This works for any of the supported update procedures (`--checkout`,
 305`--rebase`, etc.).  The only change is the source of the target SHA-1.
 306For example, `submodule update --remote --merge` will merge upstream
 307submodule changes into the submodules, while `submodule update
 308--merge` will merge superproject gitlink changes into the submodules.
 309+
 310In order to ensure a current tracking branch state, `update --remote`
 311fetches the submodule's remote repository before calculating the
 312SHA-1.  If you don't want to fetch, you should use `submodule update
 313--remote --no-fetch`.
 314+
 315Use this option to integrate changes from the upstream subproject with
 316your submodule's current HEAD.  Alternatively, you can run `git pull`
 317from the submodule, which is equivalent except for the remote branch
 318name: `update --remote` uses the default upstream repository and
 319`submodule.<name>.branch`, while `git pull` uses the submodule's
 320`branch.<name>.merge`.  Prefer `submodule.<name>.branch` if you want
 321to distribute the default upstream branch with the superproject and
 322`branch.<name>.merge` if you want a more native feel while working in
 323the submodule itself.
 324
 325-N::
 326--no-fetch::
 327        This option is only valid for the update command.
 328        Don't fetch new objects from the remote site.
 329
 330--checkout::
 331        This option is only valid for the update command.
 332        Checkout the commit recorded in the superproject on a detached HEAD
 333        in the submodule. This is the default behavior, the main use of
 334        this option is to override `submodule.$name.update` when set to
 335        a value other than `checkout`.
 336        If the key `submodule.$name.update` is either not explicitly set or
 337        set to `checkout`, this option is implicit.
 338
 339--merge::
 340        This option is only valid for the update command.
 341        Merge the commit recorded in the superproject into the current branch
 342        of the submodule. If this option is given, the submodule's HEAD will
 343        not be detached. If a merge failure prevents this process, you will
 344        have to resolve the resulting conflicts within the submodule with the
 345        usual conflict resolution tools.
 346        If the key `submodule.$name.update` is set to `merge`, this option is
 347        implicit.
 348
 349--rebase::
 350        This option is only valid for the update command.
 351        Rebase the current branch onto the commit recorded in the
 352        superproject. If this option is given, the submodule's HEAD will not
 353        be detached. If a merge failure prevents this process, you will have
 354        to resolve these failures with linkgit:git-rebase[1].
 355        If the key `submodule.$name.update` is set to `rebase`, this option is
 356        implicit.
 357
 358--init::
 359        This option is only valid for the update command.
 360        Initialize all submodules for which "git submodule init" has not been
 361        called so far before updating.
 362
 363--name::
 364        This option is only valid for the add command. It sets the submodule's
 365        name to the given string instead of defaulting to its path. The name
 366        must be valid as a directory name and may not end with a '/'.
 367
 368--reference <repository>::
 369        This option is only valid for add and update commands.  These
 370        commands sometimes need to clone a remote repository. In this case,
 371        this option will be passed to the linkgit:git-clone[1] command.
 372+
 373*NOTE*: Do *not* use this option unless you have read the note
 374for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
 375
 376--recursive::
 377        This option is only valid for foreach, update, status and sync commands.
 378        Traverse submodules recursively. The operation is performed not
 379        only in the submodules of the current repo, but also
 380        in any nested submodules inside those submodules (and so on).
 381
 382--depth::
 383        This option is valid for add and update commands. Create a 'shallow'
 384        clone with a history truncated to the specified number of revisions.
 385        See linkgit:git-clone[1]
 386
 387-j <n>::
 388--jobs <n>::
 389        This option is only valid for the update command.
 390        Clone new submodules in parallel with as many jobs.
 391        Defaults to the `submodule.fetchJobs` option.
 392
 393<path>...::
 394        Paths to submodule(s). When specified this will restrict the command
 395        to only operate on the submodules found at the specified paths.
 396        (This argument is required with add).
 397
 398FILES
 399-----
 400When initializing submodules, a .gitmodules file in the top-level directory
 401of the containing repository is used to find the url of each submodule.
 402This file should be formatted in the same way as `$GIT_DIR/config`. The key
 403to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
 404for details.
 405
 406GIT
 407---
 408Part of the linkgit:git[1] suite