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