Documentation / git-submodule.txton commit git-submodule: add support for --rebase. (ca2cedb)
   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] [--] <repository> <path>
  13'git submodule' [--quiet] status [--cached] [--] [<path>...]
  14'git submodule' [--quiet] init [--] [<path>...]
  15'git submodule' [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--] [<path>...]
  16'git submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
  17'git submodule' [--quiet] foreach <command>
  18'git submodule' [--quiet] sync [--] [<path>...]
  19
  20
  21DESCRIPTION
  22-----------
  23Submodules allow foreign repositories to be embedded within
  24a dedicated subdirectory of the source tree, always pointed
  25at a particular commit.
  26
  27They are not to be confused with remotes, which are meant mainly
  28for branches of the same project; submodules are meant for
  29different projects you would like to make part of your source tree,
  30while the history of the two projects still stays completely
  31independent and you cannot modify the contents of the submodule
  32from within the main project.
  33If you want to merge the project histories and want to treat the
  34aggregated whole as a single project from then on, you may want to
  35add a remote for the other project and use the 'subtree' merge strategy,
  36instead of treating the other project as a submodule. Directories
  37that come from both projects can be cloned and checked out as a whole
  38if you choose to go that route.
  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` file at the root of the source
  44tree assigns a logical name to the submodule and describes
  45the 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
  49This command will manage the tree entries and contents of the
  50gitmodules file for you, as well as inspect the status of your
  51submodules and update them.
  52When adding a new submodule to the tree, the 'add' subcommand
  53is to be used.  However, when pulling a tree containing submodules,
  54these will not be checked out by default;
  55the 'init' and 'update' subcommands will maintain submodules
  56checked out and at appropriate revision in your working tree.
  57You can briefly inspect the up-to-date status of your submodules
  58using the 'status' subcommand and get a detailed overview of the
  59difference between the index and checkouts using the 'summary'
  60subcommand.
  61
  62
  63COMMANDS
  64--------
  65add::
  66        Add the given repository as a submodule at the given path
  67        to the changeset to be committed next to the current
  68        project: the current project is termed the "superproject".
  69+
  70This requires two arguments: <repository> and <path>.
  71+
  72<repository> is the URL of the new submodule's origin repository.
  73This may be either an absolute URL, or (if it begins with ./
  74or ../), the location relative to the superproject's origin
  75repository.
  76+
  77<path> is the relative location for the cloned submodule to
  78exist in the superproject. If <path> does not exist, then the
  79submodule is created by cloning from the named URL. If <path> does
  80exist and is already a valid git repository, then this is added
  81to the changeset without cloning. This second form is provided
  82to ease creating a new submodule from scratch, and presumes
  83the user will later push the submodule to the given URL.
  84+
  85In either case, the given URL is recorded into .gitmodules for
  86use by subsequent users cloning the superproject. If the URL is
  87given relative to the superproject's repository, the presumption
  88is the superproject and submodule repositories will be kept
  89together in the same relative location, and only the
  90superproject's URL needs to be provided: git-submodule will correctly
  91locate the submodule using the relative URL in .gitmodules.
  92
  93status::
  94        Show the status of the submodules. This will print the SHA-1 of the
  95        currently checked out commit for each submodule, along with the
  96        submodule path and the output of 'git-describe' for the
  97        SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
  98        initialized and `+` if the currently checked out submodule commit
  99        does not match the SHA-1 found in the index of the containing
 100        repository. This command is the default command for 'git-submodule'.
 101
 102init::
 103        Initialize the submodules, i.e. register each submodule name
 104        and url found in .gitmodules into .git/config.
 105        The key used in .git/config is `submodule.$name.url`.
 106        This command does not alter existing information in .git/config.
 107        You can then customize the submodule clone URLs in .git/config
 108        for your local setup and proceed to 'git submodule update';
 109        you can also just use 'git submodule update --init' without
 110        the explicit 'init' step if you do not intend to customize
 111        any submodule locations.
 112
 113update::
 114        Update the registered submodules, i.e. clone missing submodules and
 115        checkout the commit specified in the index of the containing repository.
 116        This will make the submodules HEAD be detached unless '--rebase' is
 117        specified or the key `submodule.$name.rebase` is set to `true`.
 118+
 119If the submodule is not yet initialized, and you just want to use the
 120setting as stored in .gitmodules, you can automatically initialize the
 121submodule with the --init option.
 122
 123summary::
 124        Show commit summary between the given commit (defaults to HEAD) and
 125        working tree/index. For a submodule in question, a series of commits
 126        in the submodule between the given super project commit and the
 127        index or working tree (switched by --cached) are shown.
 128
 129foreach::
 130        Evaluates an arbitrary shell command in each checked out submodule.
 131        The command has access to the variables $path and $sha1:
 132        $path is the name of the submodule directory relative to the
 133        superproject, and $sha1 is the commit as recorded in the superproject.
 134        Any submodules defined in the superproject but not checked out are
 135        ignored by this command. Unless given --quiet, foreach prints the name
 136        of each submodule before evaluating the command.
 137        A non-zero return from the command in any submodule causes
 138        the processing to terminate. This can be overridden by adding '|| :'
 139        to the end of the command.
 140+
 141As an example, "git submodule foreach 'echo $path `git rev-parse HEAD`' will
 142show the path and currently checked out commit for each submodule.
 143
 144sync::
 145        Synchronizes submodules' remote URL configuration setting
 146        to the value specified in .gitmodules.  This is useful when
 147        submodule URLs change upstream and you need to update your local
 148        repositories accordingly.
 149+
 150"git submodule sync" synchronizes all submodules while
 151"git submodule sync -- A" synchronizes submodule "A" only.
 152
 153OPTIONS
 154-------
 155-q::
 156--quiet::
 157        Only print error messages.
 158
 159-b::
 160--branch::
 161        Branch of repository to add as submodule.
 162
 163--cached::
 164        This option is only valid for status and summary commands.  These
 165        commands typically use the commit found in the submodule HEAD, but
 166        with this option, the commit stored in the index is used instead.
 167
 168-n::
 169--summary-limit::
 170        This option is only valid for the summary command.
 171        Limit the summary size (number of commits shown in total).
 172        Giving 0 will disable the summary; a negative number means unlimited
 173        (the default). This limit only applies to modified submodules. The
 174        size is always limited to 1 for added/deleted/typechanged submodules.
 175
 176-N::
 177--no-fetch::
 178        This option is only valid for the update command.
 179        Don't fetch new objects from the remote site.
 180
 181--rebase::
 182        This option is only valid for the update command.
 183        Rebase the current branch onto the commit recorded in the
 184        superproject. If this option is given, the submodule's HEAD will not
 185        be detached. If a a merge failure prevents this process, you will have
 186        to resolve these failures with linkgit:git-rebase[1].
 187        If the key `submodule.$name.rebase` is set to `true`, this option is
 188        implicit.
 189
 190<path>...::
 191        Paths to submodule(s). When specified this will restrict the command
 192        to only operate on the submodules found at the specified paths.
 193        (This argument is required with add).
 194
 195FILES
 196-----
 197When initializing submodules, a .gitmodules file in the top-level directory
 198of the containing repository is used to find the url of each submodule.
 199This file should be formatted in the same way as `$GIT_DIR/config`. The key
 200to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
 201for details.
 202
 203
 204AUTHOR
 205------
 206Written by Lars Hjemli <hjemli@gmail.com>
 207
 208GIT
 209---
 210Part of the linkgit:git[1] suite