Documentation / git-submodule.txton commit git-p4: add failing test for P4EDITOR handling (9afbb2d)
   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|--merge] [--reference <repository>]
  19              [--depth <depth>] [--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 [--recursive] [--] [<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+
 158--
 159Update the registered submodules to match what the superproject
 160expects by cloning missing submodules and updating the working tree of
 161the submodules. The "updating" can be done in several ways depending
 162on command line options and the value of `submodule.<name>.update`
 163configuration variable. Supported update procedures are:
 164
 165        checkout;; the commit recorded in the superproject will be
 166            checked out in the submodule on a detached HEAD. This is
 167            done when `--checkout` option is given, or no option is
 168            given, and `submodule.<name>.update` is unset, or if it is
 169            set to 'checkout'.
 170+
 171If `--force` is specified, the submodule will be checked out (using
 172`git checkout --force` if appropriate), even if the commit specified
 173in the index of the containing repository already matches the commit
 174checked out in the submodule.
 175
 176        rebase;; the current branch of the submodule will be rebased
 177            onto the commit recorded in the superproject. This is done
 178            when `--rebase` option is given, or no option is given, and
 179            `submodule.<name>.update` is set to 'rebase'.
 180
 181        merge;; the commit recorded in the superproject will be merged
 182            into the current branch in the submodule. This is done
 183            when `--merge` option is given, or no option is given, and
 184            `submodule.<name>.update` is set to 'merge'.
 185
 186        custom command;; arbitrary shell command that takes a single
 187            argument (the sha1 of the commit recorded in the
 188            superproject) is executed. This is done when no option is
 189            given, and `submodule.<name>.update` has the form of
 190            '!command'.
 191
 192When no option is given and `submodule.<name>.update` is set to 'none',
 193the submodule is not updated.
 194
 195If the submodule is not yet initialized, and you just want to use the
 196setting as stored in .gitmodules, you can automatically initialize the
 197submodule with the `--init` option.
 198
 199If `--recursive` is specified, this command will recurse into the
 200registered submodules, and update any nested submodules within.
 201--
 202summary::
 203        Show commit summary between the given commit (defaults to HEAD) and
 204        working tree/index. For a submodule in question, a series of commits
 205        in the submodule between the given super project commit and the
 206        index or working tree (switched by `--cached`) are shown. If the option
 207        `--files` is given, show the series of commits in the submodule between
 208        the index of the super project and the working tree of the submodule
 209        (this option doesn't allow to use the `--cached` option or to provide an
 210        explicit commit).
 211+
 212Using the `--submodule=log` option with linkgit:git-diff[1] will provide that
 213information too.
 214
 215foreach::
 216        Evaluates an arbitrary shell command in each checked out submodule.
 217        The command has access to the variables $name, $path, $sha1 and
 218        $toplevel:
 219        $name is the name of the relevant submodule section in .gitmodules,
 220        $path is the name of the submodule directory relative to the
 221        superproject, $sha1 is the commit as recorded in the superproject,
 222        and $toplevel is the absolute path to the top-level of the superproject.
 223        Any submodules defined in the superproject but not checked out are
 224        ignored by this command. Unless given `--quiet`, foreach prints the name
 225        of each submodule before evaluating the command.
 226        If `--recursive` is given, submodules are traversed recursively (i.e.
 227        the given shell command is evaluated in nested submodules as well).
 228        A non-zero return from the command in any submodule causes
 229        the processing to terminate. This can be overridden by adding '|| :'
 230        to the end of the command.
 231+
 232As an example, +git submodule foreach \'echo $path {backtick}git
 233rev-parse HEAD{backtick}'+ will show the path and currently checked out
 234commit for each submodule.
 235
 236sync::
 237        Synchronizes submodules' remote URL configuration setting
 238        to the value specified in .gitmodules. It will only affect those
 239        submodules which already have a URL entry in .git/config (that is the
 240        case when they are initialized or freshly added). This is useful when
 241        submodule URLs change upstream and you need to update your local
 242        repositories accordingly.
 243+
 244"git submodule sync" synchronizes all submodules while
 245"git submodule sync \-- A" synchronizes submodule "A" only.
 246
 247OPTIONS
 248-------
 249-q::
 250--quiet::
 251        Only print error messages.
 252
 253-b::
 254--branch::
 255        Branch of repository to add as submodule.
 256        The name of the branch is recorded as `submodule.<name>.branch` in
 257        `.gitmodules` for `update --remote`.
 258
 259-f::
 260--force::
 261        This option is only valid for add, deinit and update commands.
 262        When running add, allow adding an otherwise ignored submodule path.
 263        When running deinit the submodule work trees will be removed even if
 264        they contain local changes.
 265        When running update (only effective with the checkout procedure),
 266        throw away local changes in submodules when switching to a
 267        different commit; and always run a checkout operation in the
 268        submodule, even if the commit listed in the index of the
 269        containing repository matches the commit checked out in the
 270        submodule.
 271
 272--cached::
 273        This option is only valid for status and summary commands.  These
 274        commands typically use the commit found in the submodule HEAD, but
 275        with this option, the commit stored in the index is used instead.
 276
 277--files::
 278        This option is only valid for the summary command. This command
 279        compares the commit in the index with that in the submodule HEAD
 280        when this option is used.
 281
 282-n::
 283--summary-limit::
 284        This option is only valid for the summary command.
 285        Limit the summary size (number of commits shown in total).
 286        Giving 0 will disable the summary; a negative number means unlimited
 287        (the default). This limit only applies to modified submodules. The
 288        size is always limited to 1 for added/deleted/typechanged submodules.
 289
 290--remote::
 291        This option is only valid for the update command.  Instead of using
 292        the superproject's recorded SHA-1 to update the submodule, use the
 293        status of the submodule's remote-tracking branch.  The remote used
 294        is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
 295        The remote branch used defaults to `master`, but the branch name may
 296        be overridden by setting the `submodule.<name>.branch` option in
 297        either `.gitmodules` or `.git/config` (with `.git/config` taking
 298        precedence).
 299+
 300This works for any of the supported update procedures (`--checkout`,
 301`--rebase`, etc.).  The only change is the source of the target SHA-1.
 302For example, `submodule update --remote --merge` will merge upstream
 303submodule changes into the submodules, while `submodule update
 304--merge` will merge superproject gitlink changes into the submodules.
 305+
 306In order to ensure a current tracking branch state, `update --remote`
 307fetches the submodule's remote repository before calculating the
 308SHA-1.  If you don't want to fetch, you should use `submodule update
 309--remote --no-fetch`.
 310+
 311Use this option to integrate changes from the upstream subproject with
 312your submodule's current HEAD.  Alternatively, you can run `git pull`
 313from the submodule, which is equivalent except for the remote branch
 314name: `update --remote` uses the default upstream repository and
 315`submodule.<name>.branch`, while `git pull` uses the submodule's
 316`branch.<name>.merge`.  Prefer `submodule.<name>.branch` if you want
 317to distribute the default upstream branch with the superproject and
 318`branch.<name>.merge` if you want a more native feel while working in
 319the submodule itself.
 320
 321-N::
 322--no-fetch::
 323        This option is only valid for the update command.
 324        Don't fetch new objects from the remote site.
 325
 326--checkout::
 327        This option is only valid for the update command.
 328        Checkout the commit recorded in the superproject on a detached HEAD
 329        in the submodule. This is the default behavior, the main use of
 330        this option is to override `submodule.$name.update` when set to
 331        a value other than `checkout`.
 332        If the key `submodule.$name.update` is either not explicitly set or
 333        set to `checkout`, this option is implicit.
 334
 335--merge::
 336        This option is only valid for the update command.
 337        Merge the commit recorded in the superproject into the current branch
 338        of the submodule. If this option is given, the submodule's HEAD will
 339        not be detached. If a merge failure prevents this process, you will
 340        have to resolve the resulting conflicts within the submodule with the
 341        usual conflict resolution tools.
 342        If the key `submodule.$name.update` is set to `merge`, this option is
 343        implicit.
 344
 345--rebase::
 346        This option is only valid for the update command.
 347        Rebase the current branch onto the commit recorded in the
 348        superproject. If this option is given, the submodule's HEAD will not
 349        be detached. If a merge failure prevents this process, you will have
 350        to resolve these failures with linkgit:git-rebase[1].
 351        If the key `submodule.$name.update` is set to `rebase`, this option is
 352        implicit.
 353
 354--init::
 355        This option is only valid for the update command.
 356        Initialize all submodules for which "git submodule init" has not been
 357        called so far before updating.
 358
 359--name::
 360        This option is only valid for the add command. It sets the submodule's
 361        name to the given string instead of defaulting to its path. The name
 362        must be valid as a directory name and may not end with a '/'.
 363
 364--reference <repository>::
 365        This option is only valid for add and update commands.  These
 366        commands sometimes need to clone a remote repository. In this case,
 367        this option will be passed to the linkgit:git-clone[1] command.
 368+
 369*NOTE*: Do *not* use this option unless you have read the note
 370for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully.
 371
 372--recursive::
 373        This option is only valid for foreach, update and status commands.
 374        Traverse submodules recursively. The operation is performed not
 375        only in the submodules of the current repo, but also
 376        in any nested submodules inside those submodules (and so on).
 377
 378--depth::
 379        This option is valid for add and update commands. Create a 'shallow'
 380        clone with a history truncated to the specified number of revisions.
 381        See linkgit:git-clone[1]
 382
 383
 384<path>...::
 385        Paths to submodule(s). When specified this will restrict the command
 386        to only operate on the submodules found at the specified paths.
 387        (This argument is required with add).
 388
 389FILES
 390-----
 391When initializing submodules, a .gitmodules file in the top-level directory
 392of the containing repository is used to find the url of each submodule.
 393This file should be formatted in the same way as `$GIT_DIR/config`. The key
 394to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
 395for details.
 396
 397GIT
 398---
 399Part of the linkgit:git[1] suite