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