Documentation / git-submodule.txton commit Merge branch 'da/difftool-git-files' into maint (01e13d0)
   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] [--] <path>...
  17'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch]
  18              [-f|--force] [--rebase] [--reference <repository>] [--depth <depth>]
  19              [--merge] [--recursive] [--] [<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 [--] [<path>...]
  24
  25
  26DESCRIPTION
  27-----------
  28Submodules allow foreign repositories to be embedded within
  29a dedicated subdirectory of the source tree, always pointed
  30at a particular commit.
  31
  32They are not to be confused with remotes, which are meant mainly
  33for branches of the same project; submodules are meant for
  34different projects you would like to make part of your source tree,
  35while the history of the two projects still stays completely
  36independent and you cannot modify the contents of the submodule
  37from within the main project.
  38If you want to merge the project histories and want to treat the
  39aggregated whole as a single project from then on, you may want to
  40add a remote for the other project and use the 'subtree' merge strategy,
  41instead of treating the other project as a submodule. Directories
  42that come from both projects can be cloned and checked out as a whole
  43if you choose to go that route.
  44
  45Submodules are composed from a so-called `gitlink` tree entry
  46in the main repository that refers to a particular commit object
  47within the inner repository that is completely separate.
  48A record in the `.gitmodules` (see linkgit:gitmodules[5]) file at the
  49root of the source tree assigns a logical name to the submodule and
  50describes the default URL the submodule shall be cloned from.
  51The logical name can be used for overriding this URL within your
  52local repository configuration (see 'submodule init').
  53
  54This command will manage the tree entries and contents of the
  55gitmodules file for you, as well as inspect the status of your
  56submodules and update them.
  57When adding a new submodule to the tree, the 'add' subcommand
  58is to be used.  However, when pulling a tree containing submodules,
  59these will not be checked out by default;
  60the 'init' and 'update' subcommands will maintain submodules
  61checked out and at appropriate revision in your working tree.
  62You can briefly inspect the up-to-date status of your submodules
  63using the 'status' subcommand and get a detailed overview of the
  64difference between the index and checkouts using the 'summary'
  65subcommand.
  66
  67
  68COMMANDS
  69--------
  70add::
  71        Add the given repository as a submodule at the given path
  72        to the changeset to be committed next to the current
  73        project: the current project is termed the "superproject".
  74+
  75This requires at least one argument: <repository>. The optional
  76argument <path> is the relative location for the cloned submodule
  77to exist in the superproject. If <path> is not given, the
  78"humanish" part of the source repository is used ("repo" for
  79"/path/to/repo.git" and "foo" for "host.xz:foo/.git").
  80The <path> is also used as the submodule's logical name in its
  81configuration entries unless `--name` is used to specify a logical name.
  82+
  83<repository> is the URL of the new submodule's origin repository.
  84This may be either an absolute URL, or (if it begins with ./
  85or ../), the location relative to the superproject's origin
  86repository (Please note that to specify a repository 'foo.git'
  87which is located right next to a superproject 'bar.git', you'll
  88have to use '../foo.git' instead of './foo.git' - as one might expect
  89when following the rules for relative URLs - because the evaluation
  90of relative URLs in Git is identical to that of relative directories).
  91If the superproject doesn't have an origin configured
  92the superproject is its own authoritative upstream and the current
  93working directory is used instead.
  94+
  95<path> is the relative location for the cloned submodule to
  96exist in the superproject. If <path> does not exist, then the
  97submodule is created by cloning from the named URL. If <path> does
  98exist and is already a valid Git repository, then this is added
  99to the changeset without cloning. This second form is provided
 100to ease creating a new submodule from scratch, and presumes
 101the user will later push the submodule to the given URL.
 102+
 103In either case, the given URL is recorded into .gitmodules for
 104use by subsequent users cloning the superproject. If the URL is
 105given relative to the superproject's repository, the presumption
 106is the superproject and submodule repositories will be kept
 107together in the same relative location, and only the
 108superproject's URL needs to be provided: git-submodule will correctly
 109locate the submodule using the relative URL in .gitmodules.
 110
 111status::
 112        Show the status of the submodules. This will print the SHA-1 of the
 113        currently checked out commit for each submodule, along with the
 114        submodule path and the output of 'git describe' for the
 115        SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
 116        initialized, `+` if the currently checked out submodule commit
 117        does not match the SHA-1 found in the index of the containing
 118        repository and `U` if the submodule has merge conflicts.
 119+
 120If `--recursive` is specified, this command will recurse into nested
 121submodules, and show their status as well.
 122+
 123If you are only interested in changes of the currently initialized
 124submodules with respect to the commit recorded in the index or the HEAD,
 125linkgit:git-status[1] and linkgit:git-diff[1] will provide that information
 126too (and can also report changes to a submodule's work tree).
 127
 128init::
 129        Initialize the submodules recorded in the index (which were
 130        added and committed elsewhere) by copying submodule
 131        names and urls from .gitmodules to .git/config.
 132        Optional <path> arguments limit which submodules will be initialized.
 133        It will also copy the value of `submodule.$name.update` into
 134        .git/config.
 135        The key used in .git/config is `submodule.$name.url`.
 136        This command does not alter existing information in .git/config.
 137        You can then customize the submodule clone URLs in .git/config
 138        for your local setup and proceed to `git submodule update`;
 139        you can also just use `git submodule update --init` without
 140        the explicit 'init' step if you do not intend to customize
 141        any submodule locations.
 142
 143deinit::
 144        Unregister the given submodules, i.e. remove the whole
 145        `submodule.$name` section from .git/config together with their work
 146        tree. Further calls to `git submodule update`, `git submodule foreach`
 147        and `git submodule sync` will skip any unregistered submodules until
 148        they are initialized again, so use this command if you don't want to
 149        have a local checkout of the submodule in your work tree anymore. If
 150        you really want to remove a submodule from the repository and commit
 151        that use linkgit:git-rm[1] instead.
 152+
 153If `--force` is specified, the submodule's work tree will be removed even if
 154it contains local modifications.
 155
 156update::
 157        Update the registered submodules, i.e. clone missing submodules and
 158        checkout the commit specified in the index of the containing repository.
 159        This will make the submodules HEAD be detached unless `--rebase` or
 160        `--merge` is specified or the key `submodule.$name.update` is set to
 161        `rebase`, `merge` or `none`. `none` can be overridden by specifying
 162        `--checkout`. Setting the key `submodule.$name.update` to `!command`
 163        will cause `command` to be run. `command` can be any arbitrary shell
 164        command that takes a single argument, namely the sha1 to update to.
 165+
 166If the submodule is not yet initialized, and you just want to use the
 167setting as stored in .gitmodules, you can automatically initialize the
 168submodule with the `--init` option.
 169+
 170If `--recursive` is specified, this command will recurse into the
 171registered submodules, and update any nested submodules within.
 172+
 173If `--force` is specified, the submodule will be checked out (using
 174`git checkout --force` if appropriate), even if the commit specified in the
 175index of the containing repository already matches the commit checked out in
 176the submodule.
 177
 178summary::
 179        Show commit summary between the given commit (defaults to HEAD) and
 180        working tree/index. For a submodule in question, a series of commits
 181        in the submodule between the given super project commit and the
 182        index or working tree (switched by `--cached`) are shown. If the option
 183        `--files` is given, show the series of commits in the submodule between
 184        the index of the super project and the working tree of the submodule
 185        (this option doesn't allow to use the `--cached` option or to provide an
 186        explicit commit).
 187+
 188Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
 189information too.
 190
 191foreach::
 192        Evaluates an arbitrary shell command in each checked out submodule.
 193        The command has access to the variables $name, $path, $sha1 and
 194        $toplevel:
 195        $name is the name of the relevant submodule section in .gitmodules,
 196        $path is the name of the submodule directory relative to the
 197        superproject, $sha1 is the commit as recorded in the superproject,
 198        and $toplevel is the absolute path to the top-level of the superproject.
 199        Any submodules defined in the superproject but not checked out are
 200        ignored by this command. Unless given `--quiet`, foreach prints the name
 201        of each submodule before evaluating the command.
 202        If `--recursive` is given, submodules are traversed recursively (i.e.
 203        the given shell command is evaluated in nested submodules as well).
 204        A non-zero return from the command in any submodule causes
 205        the processing to terminate. This can be overridden by adding '|| :'
 206        to the end of the command.
 207+
 208As an example, +git submodule foreach \'echo $path {backtick}git
 209rev-parse HEAD{backtick}'+ will show the path and currently checked out
 210commit for each submodule.
 211
 212sync::
 213        Synchronizes submodules' remote URL configuration setting
 214        to the value specified in .gitmodules. It will only affect those
 215        submodules which already have a URL entry in .git/config (that is the
 216        case when they are initialized or freshly added). This is useful when
 217        submodule URLs change upstream and you need to update your local
 218        repositories accordingly.
 219+
 220"git submodule sync" synchronizes all submodules while
 221"git submodule sync \-- A" synchronizes submodule "A" only.
 222
 223OPTIONS
 224-------
 225-q::
 226--quiet::
 227        Only print error messages.
 228
 229-b::
 230--branch::
 231        Branch of repository to add as submodule.
 232        The name of the branch is recorded as `submodule.<path>.branch` in
 233        `.gitmodules` for `update --remote`.
 234
 235-f::
 236--force::
 237        This option is only valid for add, deinit and update commands.
 238        When running add, allow adding an otherwise ignored submodule path.
 239        When running deinit the submodule work trees will be removed even if
 240        they contain local changes.
 241        When running update, throw away local changes in submodules when
 242        switching to a different commit; and always run a checkout operation
 243        in the submodule, even if the commit listed in the index of the
 244        containing repository matches the commit checked out in the submodule.
 245
 246--cached::
 247        This option is only valid for status and summary commands.  These
 248        commands typically use the commit found in the submodule HEAD, but
 249        with this option, the commit stored in the index is used instead.
 250
 251--files::
 252        This option is only valid for the summary command. This command
 253        compares the commit in the index with that in the submodule HEAD
 254        when this option is used.
 255
 256-n::
 257--summary-limit::
 258        This option is only valid for the summary command.
 259        Limit the summary size (number of commits shown in total).
 260        Giving 0 will disable the summary; a negative number means unlimited
 261        (the default). This limit only applies to modified submodules. The
 262        size is always limited to 1 for added/deleted/typechanged submodules.
 263
 264--remote::
 265        This option is only valid for the update command.  Instead of using
 266        the superproject's recorded SHA-1 to update the submodule, use the
 267        status of the submodule's remote-tracking branch.  The remote used
 268        is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
 269        The remote branch used defaults to `master`, but the branch name may
 270        be overridden by setting the `submodule.<name>.branch` option in
 271        either `.gitmodules` or `.git/config` (with `.git/config` taking
 272        precedence).
 273+
 274This works for any of the supported update procedures (`--checkout`,
 275`--rebase`, etc.).  The only change is the source of the target SHA-1.
 276For example, `submodule update --remote --merge` will merge upstream
 277submodule changes into the submodules, while `submodule update
 278--merge` will merge superproject gitlink changes into the submodules.
 279+
 280In order to ensure a current tracking branch state, `update --remote`
 281fetches the submodule's remote repository before calculating the
 282SHA-1.  If you don't want to fetch, you should use `submodule update
 283--remote --no-fetch`.
 284
 285-N::
 286--no-fetch::
 287        This option is only valid for the update command.
 288        Don't fetch new objects from the remote site.
 289
 290--merge::
 291        This option is only valid for the update command.
 292        Merge the commit recorded in the superproject into the current branch
 293        of the submodule. If this option is given, the submodule's HEAD will
 294        not be detached. If a merge failure prevents this process, you will
 295        have to resolve the resulting conflicts within the submodule with the
 296        usual conflict resolution tools.
 297        If the key `submodule.$name.update` is set to `merge`, this option is
 298        implicit.
 299
 300--rebase::
 301        This option is only valid for the update command.
 302        Rebase the current branch onto the commit recorded in the
 303        superproject. If this option is given, the submodule's HEAD will not
 304        be detached. If a merge failure prevents this process, you will have
 305        to resolve these failures with linkgit:git-rebase[1].
 306        If the key `submodule.$name.update` is set to `rebase`, this option is
 307        implicit.
 308
 309--init::
 310        This option is only valid for the update command.
 311        Initialize all submodules for which "git submodule init" has not been
 312        called so far before updating.
 313
 314--name::
 315        This option is only valid for the add command. It sets the submodule's
 316        name to the given string instead of defaulting to its path. The name
 317        must be valid as a directory name and may not end with a '/'.
 318
 319--reference <repository>::
 320        This option is only valid for add and update commands.  These
 321        commands sometimes need to clone a remote repository. In this case,
 322        this option will be passed to the linkgit:git-clone[1] command.
 323+
 324*NOTE*: Do *not* use this option unless you have read the note
 325for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
 326
 327--recursive::
 328        This option is only valid for foreach, update and status commands.
 329        Traverse submodules recursively. The operation is performed not
 330        only in the submodules of the current repo, but also
 331        in any nested submodules inside those submodules (and so on).
 332
 333--depth::
 334        This option is valid for add and update commands. Create a 'shallow'
 335        clone with a history truncated to the specified number of revisions.
 336        See linkgit:git-clone[1]
 337
 338
 339<path>...::
 340        Paths to submodule(s). When specified this will restrict the command
 341        to only operate on the submodules found at the specified paths.
 342        (This argument is required with add).
 343
 344FILES
 345-----
 346When initializing submodules, a .gitmodules file in the top-level directory
 347of the containing repository is used to find the url of each submodule.
 348This file should be formatted in the same way as `$GIT_DIR/config`. The key
 349to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
 350for details.
 351
 352GIT
 353---
 354Part of the linkgit:git[1] suite