Documentation / git.txton commit Merge branch 'maint' (e3c58f8)
   1git(7)
   2======
   3
   4NAME
   5----
   6git - the stupid content tracker
   7
   8
   9SYNOPSIS
  10--------
  11[verse]
  12'git' [--version] [--exec-path[=GIT_EXEC_PATH]]
  13    [-p|--paginate|--no-pager]
  14    [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
  15    [--help] COMMAND [ARGS]
  16
  17DESCRIPTION
  18-----------
  19Git is a fast, scalable, distributed revision control system with an
  20unusually rich command set that provides both high-level operations
  21and full access to internals.
  22
  23See this link:tutorial.html[tutorial] to get started, then see
  24link:everyday.html[Everyday Git] for a useful minimum set of commands, and
  25"man git-commandname" for documentation of each command.  CVS users may
  26also want to read link:cvs-migration.html[CVS migration].  See
  27link:user-manual.html[Git User's Manual] for a more in-depth
  28introduction.
  29
  30The COMMAND is either a name of a Git command (see below) or an alias
  31as defined in the configuration file (see linkgit:git-config[1]).
  32
  33Formatted and hyperlinked version of the latest git
  34documentation can be viewed at
  35`http://www.kernel.org/pub/software/scm/git/docs/`.
  36
  37ifdef::stalenotes[]
  38[NOTE]
  39============
  40
  41You are reading the documentation for the latest (possibly
  42unreleased) version of git, that is available from 'master'
  43branch of the `git.git` repository.
  44Documentation for older releases are available here:
  45
  46* link:v1.5.4.2/git.html[documentation for release 1.5.4.2]
  47
  48* release notes for
  49  link:RelNotes-1.5.4.2.txt[1.5.4.2],
  50  link:RelNotes-1.5.4.1.txt[1.5.4.1],
  51  link:RelNotes-1.5.4.txt[1.5.4].
  52
  53* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
  54
  55* release notes for
  56  link:RelNotes-1.5.3.8.txt[1.5.3.8],
  57  link:RelNotes-1.5.3.7.txt[1.5.3.7],
  58  link:RelNotes-1.5.3.6.txt[1.5.3.6],
  59  link:RelNotes-1.5.3.5.txt[1.5.3.5],
  60  link:RelNotes-1.5.3.4.txt[1.5.3.4],
  61  link:RelNotes-1.5.3.3.txt[1.5.3.3],
  62  link:RelNotes-1.5.3.2.txt[1.5.3.2],
  63  link:RelNotes-1.5.3.1.txt[1.5.3.1],
  64  link:RelNotes-1.5.3.txt[1.5.3].
  65
  66* release notes for
  67  link:RelNotes-1.5.2.5.txt[1.5.2.5],
  68  link:RelNotes-1.5.2.4.txt[1.5.2.4],
  69  link:RelNotes-1.5.2.3.txt[1.5.2.3],
  70  link:RelNotes-1.5.2.2.txt[1.5.2.2],
  71  link:RelNotes-1.5.2.1.txt[1.5.2.1],
  72  link:RelNotes-1.5.2.txt[1.5.2].
  73
  74* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
  75
  76* release notes for
  77  link:RelNotes-1.5.1.6.txt[1.5.1.6],
  78  link:RelNotes-1.5.1.5.txt[1.5.1.5],
  79  link:RelNotes-1.5.1.4.txt[1.5.1.4],
  80  link:RelNotes-1.5.1.3.txt[1.5.1.3],
  81  link:RelNotes-1.5.1.2.txt[1.5.1.2],
  82  link:RelNotes-1.5.1.1.txt[1.5.1.1],
  83  link:RelNotes-1.5.1.txt[1.5.1].
  84
  85* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
  86
  87* release notes for
  88  link:RelNotes-1.5.0.7.txt[1.5.0.7],
  89  link:RelNotes-1.5.0.6.txt[1.5.0.6],
  90  link:RelNotes-1.5.0.5.txt[1.5.0.5],
  91  link:RelNotes-1.5.0.3.txt[1.5.0.3],
  92  link:RelNotes-1.5.0.2.txt[1.5.0.2],
  93  link:RelNotes-1.5.0.1.txt[1.5.0.1],
  94  link:RelNotes-1.5.0.txt[1.5.0].
  95
  96* documentation for release link:v1.4.4.4/git.html[1.4.4.4],
  97  link:v1.3.3/git.html[1.3.3],
  98  link:v1.2.6/git.html[1.2.6],
  99  link:v1.0.13/git.html[1.0.13].
 100
 101============
 102
 103endif::stalenotes[]
 104
 105OPTIONS
 106-------
 107--version::
 108        Prints the git suite version that the 'git' program came from.
 109
 110--help::
 111        Prints the synopsis and a list of the most commonly used
 112        commands. If the option '--all' or '-a' is given then all
 113        available commands are printed. If a git command is named this
 114        option will bring up the manual page for that command.
 115+
 116Other options are available to control how the manual page is
 117displayed. See linkgit:git-help[1] for more information,
 118because 'git --help ...' is converted internally into 'git
 119help ...'.
 120
 121--exec-path::
 122        Path to wherever your core git programs are installed.
 123        This can also be controlled by setting the GIT_EXEC_PATH
 124        environment variable. If no path is given 'git' will print
 125        the current setting and then exit.
 126
 127-p|--paginate::
 128        Pipe all output into 'less' (or if set, $PAGER).
 129
 130--no-pager::
 131        Do not pipe git output into a pager.
 132
 133--git-dir=<path>::
 134        Set the path to the repository. This can also be controlled by
 135        setting the GIT_DIR environment variable.
 136
 137--work-tree=<path>::
 138        Set the path to the working tree.  The value will not be
 139        used in combination with repositories found automatically in
 140        a .git directory (i.e. $GIT_DIR is not set).
 141        This can also be controlled by setting the GIT_WORK_TREE
 142        environment variable and the core.worktree configuration
 143        variable.
 144
 145--bare::
 146        Treat the repository as a bare repository.  If GIT_DIR
 147        environment is not set, it is set to the current working
 148        directory.
 149
 150
 151FURTHER DOCUMENTATION
 152---------------------
 153
 154See the references above to get started using git.  The following is
 155probably more detail than necessary for a first-time user.
 156
 157The link:user-manual.html#git-concepts[git concepts chapter of the
 158user-manual] and the link:core-tutorial.html[Core tutorial] both provide
 159introductions to the underlying git architecture.
 160
 161See also the link:howto-index.html[howto] documents for some useful
 162examples.
 163
 164The internals are documented link:technical/api-index.html[here].
 165
 166GIT COMMANDS
 167------------
 168
 169We divide git into high level ("porcelain") commands and low level
 170("plumbing") commands.
 171
 172High-level commands (porcelain)
 173-------------------------------
 174
 175We separate the porcelain commands into the main commands and some
 176ancillary user utilities.
 177
 178Main porcelain commands
 179~~~~~~~~~~~~~~~~~~~~~~~
 180
 181include::cmds-mainporcelain.txt[]
 182
 183Ancillary Commands
 184~~~~~~~~~~~~~~~~~~
 185Manipulators:
 186
 187include::cmds-ancillarymanipulators.txt[]
 188
 189Interrogators:
 190
 191include::cmds-ancillaryinterrogators.txt[]
 192
 193
 194Interacting with Others
 195~~~~~~~~~~~~~~~~~~~~~~~
 196
 197These commands are to interact with foreign SCM and with other
 198people via patch over e-mail.
 199
 200include::cmds-foreignscminterface.txt[]
 201
 202
 203Low-level commands (plumbing)
 204-----------------------------
 205
 206Although git includes its
 207own porcelain layer, its low-level commands are sufficient to support
 208development of alternative porcelains.  Developers of such porcelains
 209might start by reading about linkgit:git-update-index[1] and
 210linkgit:git-read-tree[1].
 211
 212The interface (input, output, set of options and the semantics)
 213to these low-level commands are meant to be a lot more stable
 214than Porcelain level commands, because these commands are
 215primarily for scripted use.  The interface to Porcelain commands
 216on the other hand are subject to change in order to improve the
 217end user experience.
 218
 219The following description divides
 220the low-level commands into commands that manipulate objects (in
 221the repository, index, and working tree), commands that interrogate and
 222compare objects, and commands that move objects and references between
 223repositories.
 224
 225
 226Manipulation commands
 227~~~~~~~~~~~~~~~~~~~~~
 228
 229include::cmds-plumbingmanipulators.txt[]
 230
 231
 232Interrogation commands
 233~~~~~~~~~~~~~~~~~~~~~~
 234
 235include::cmds-plumbinginterrogators.txt[]
 236
 237In general, the interrogate commands do not touch the files in
 238the working tree.
 239
 240
 241Synching repositories
 242~~~~~~~~~~~~~~~~~~~~~
 243
 244include::cmds-synchingrepositories.txt[]
 245
 246The following are helper programs used by the above; end users
 247typically do not use them directly.
 248
 249include::cmds-synchelpers.txt[]
 250
 251
 252Internal helper commands
 253~~~~~~~~~~~~~~~~~~~~~~~~
 254
 255These are internal helper commands used by other commands; end
 256users typically do not use them directly.
 257
 258include::cmds-purehelpers.txt[]
 259
 260
 261Configuration Mechanism
 262-----------------------
 263
 264Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
 265is used to hold per-repository configuration options.  It is a
 266simple text file modeled after `.ini` format familiar to some
 267people.  Here is an example:
 268
 269------------
 270#
 271# A '#' or ';' character indicates a comment.
 272#
 273
 274; core variables
 275[core]
 276        ; Don't trust file modes
 277        filemode = false
 278
 279; user identity
 280[user]
 281        name = "Junio C Hamano"
 282        email = "junkio@twinsun.com"
 283
 284------------
 285
 286Various commands read from the configuration file and adjust
 287their operation accordingly.
 288
 289
 290Identifier Terminology
 291----------------------
 292<object>::
 293        Indicates the object name for any type of object.
 294
 295<blob>::
 296        Indicates a blob object name.
 297
 298<tree>::
 299        Indicates a tree object name.
 300
 301<commit>::
 302        Indicates a commit object name.
 303
 304<tree-ish>::
 305        Indicates a tree, commit or tag object name.  A
 306        command that takes a <tree-ish> argument ultimately wants to
 307        operate on a <tree> object but automatically dereferences
 308        <commit> and <tag> objects that point at a <tree>.
 309
 310<commit-ish>::
 311        Indicates a commit or tag object name.  A
 312        command that takes a <commit-ish> argument ultimately wants to
 313        operate on a <commit> object but automatically dereferences
 314        <tag> objects that point at a <commit>.
 315
 316<type>::
 317        Indicates that an object type is required.
 318        Currently one of: `blob`, `tree`, `commit`, or `tag`.
 319
 320<file>::
 321        Indicates a filename - almost always relative to the
 322        root of the tree structure `GIT_INDEX_FILE` describes.
 323
 324Symbolic Identifiers
 325--------------------
 326Any git command accepting any <object> can also use the following
 327symbolic notation:
 328
 329HEAD::
 330        indicates the head of the current branch (i.e. the
 331        contents of `$GIT_DIR/HEAD`).
 332
 333<tag>::
 334        a valid tag 'name'
 335        (i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).
 336
 337<head>::
 338        a valid head 'name'
 339        (i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
 340
 341For a more complete list of ways to spell object names, see
 342"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 343
 344
 345File/Directory Structure
 346------------------------
 347
 348Please see the link:repository-layout.html[repository layout] document.
 349
 350Read link:hooks.html[hooks] for more details about each hook.
 351
 352Higher level SCMs may provide and manage additional information in the
 353`$GIT_DIR`.
 354
 355
 356Terminology
 357-----------
 358Please see the link:glossary.html[glossary] document.
 359
 360
 361Environment Variables
 362---------------------
 363Various git commands use the following environment variables:
 364
 365The git Repository
 366~~~~~~~~~~~~~~~~~~
 367These environment variables apply to 'all' core git commands. Nb: it
 368is worth noting that they may be used/overridden by SCMS sitting above
 369git so take care if using Cogito etc.
 370
 371'GIT_INDEX_FILE'::
 372        This environment allows the specification of an alternate
 373        index file. If not specified, the default of `$GIT_DIR/index`
 374        is used.
 375
 376'GIT_OBJECT_DIRECTORY'::
 377        If the object storage directory is specified via this
 378        environment variable then the sha1 directories are created
 379        underneath - otherwise the default `$GIT_DIR/objects`
 380        directory is used.
 381
 382'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
 383        Due to the immutable nature of git objects, old objects can be
 384        archived into shared, read-only directories. This variable
 385        specifies a ":" separated list of git object directories which
 386        can be used to search for git objects. New objects will not be
 387        written to these directories.
 388
 389'GIT_DIR'::
 390        If the 'GIT_DIR' environment variable is set then it
 391        specifies a path to use instead of the default `.git`
 392        for the base of the repository.
 393
 394'GIT_WORK_TREE'::
 395        Set the path to the working tree.  The value will not be
 396        used in combination with repositories found automatically in
 397        a .git directory (i.e. $GIT_DIR is not set).
 398        This can also be controlled by the '--work-tree' command line
 399        option and the core.worktree configuration variable.
 400
 401git Commits
 402~~~~~~~~~~~
 403'GIT_AUTHOR_NAME'::
 404'GIT_AUTHOR_EMAIL'::
 405'GIT_AUTHOR_DATE'::
 406'GIT_COMMITTER_NAME'::
 407'GIT_COMMITTER_EMAIL'::
 408'GIT_COMMITTER_DATE'::
 409'EMAIL'::
 410        see linkgit:git-commit-tree[1]
 411
 412git Diffs
 413~~~~~~~~~
 414'GIT_DIFF_OPTS'::
 415        Only valid setting is "--unified=??" or "-u??" to set the
 416        number of context lines shown when a unified diff is created.
 417        This takes precedence over any "-U" or "--unified" option
 418        value passed on the git diff command line.
 419
 420'GIT_EXTERNAL_DIFF'::
 421        When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
 422        program named by it is called, instead of the diff invocation
 423        described above.  For a path that is added, removed, or modified,
 424        'GIT_EXTERNAL_DIFF' is called with 7 parameters:
 425
 426        path old-file old-hex old-mode new-file new-hex new-mode
 427+
 428where:
 429
 430        <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
 431                         contents of <old|new>,
 432        <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
 433        <old|new>-mode:: are the octal representation of the file modes.
 434
 435+
 436The file parameters can point at the user's working file
 437(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
 438when a new file is added), or a temporary file (e.g. `old-file` in the
 439index).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the
 440temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
 441+
 442For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
 443parameter, <path>.
 444
 445other
 446~~~~~
 447'GIT_MERGE_VERBOSITY'::
 448        A number controlling the amount of output shown by
 449        the recursive merge strategy.  Overrides merge.verbosity.
 450        See linkgit:git-merge[1]
 451
 452'GIT_PAGER'::
 453        This environment variable overrides `$PAGER`. If it is set
 454        to an empty string or to the value "cat", git will not launch
 455        a pager.
 456
 457'GIT_SSH'::
 458        If this environment variable is set then linkgit:git-fetch[1]
 459        and linkgit:git-push[1] will use this command instead
 460        of `ssh` when they need to connect to a remote system.
 461        The 'GIT_SSH' command will be given exactly two arguments:
 462        the 'username@host' (or just 'host') from the URL and the
 463        shell command to execute on that remote system.
 464+
 465To pass options to the program that you want to list in GIT_SSH
 466you will need to wrap the program and options into a shell script,
 467then set GIT_SSH to refer to the shell script.
 468+
 469Usually it is easier to configure any desired options through your
 470personal `.ssh/config` file.  Please consult your ssh documentation
 471for further details.
 472
 473'GIT_FLUSH'::
 474        If this environment variable is set to "1", then commands such
 475        as git-blame (in incremental mode), git-rev-list, git-log,
 476        git-whatchanged, etc., will force a flush of the output stream
 477        after each commit-oriented record have been flushed.   If this
 478        variable is set to "0", the output of these commands will be done
 479        using completely buffered I/O.   If this environment variable is
 480        not set, git will choose buffered or record-oriented flushing
 481        based on whether stdout appears to be redirected to a file or not.
 482
 483'GIT_TRACE'::
 484        If this variable is set to "1", "2" or "true" (comparison
 485        is case insensitive), git will print `trace:` messages on
 486        stderr telling about alias expansion, built-in command
 487        execution and external command execution.
 488        If this variable is set to an integer value greater than 1
 489        and lower than 10 (strictly) then git will interpret this
 490        value as an open file descriptor and will try to write the
 491        trace messages into this file descriptor.
 492        Alternatively, if this variable is set to an absolute path
 493        (starting with a '/' character), git will interpret this
 494        as a file path and will try to write the trace messages
 495        into it.
 496
 497Discussion[[Discussion]]
 498------------------------
 499
 500More detail on the following is available from the
 501link:user-manual.html#git-concepts[git concepts chapter of the
 502user-manual] and the link:core-tutorial.html[Core tutorial].
 503
 504A git project normally consists of a working directory with a ".git"
 505subdirectory at the top level.  The .git directory contains, among other
 506things, a compressed object database representing the complete history
 507of the project, an "index" file which links that history to the current
 508contents of the working tree, and named pointers into that history such
 509as tags and branch heads.
 510
 511The object database contains objects of three main types: blobs, which
 512hold file data; trees, which point to blobs and other trees to build up
 513directory hierarchies; and commits, which each reference a single tree
 514and some number of parent commits.
 515
 516The commit, equivalent to what other systems call a "changeset" or
 517"version", represents a step in the project's history, and each parent
 518represents an immediately preceding step.  Commits with more than one
 519parent represent merges of independent lines of development.
 520
 521All objects are named by the SHA1 hash of their contents, normally
 522written as a string of 40 hex digits.  Such names are globally unique.
 523The entire history leading up to a commit can be vouched for by signing
 524just that commit.  A fourth object type, the tag, is provided for this
 525purpose.
 526
 527When first created, objects are stored in individual files, but for
 528efficiency may later be compressed together into "pack files".
 529
 530Named pointers called refs mark interesting points in history.  A ref
 531may contain the SHA1 name of an object or the name of another ref.  Refs
 532with names beginning `ref/head/` contain the SHA1 name of the most
 533recent commit (or "head") of a branch under development.  SHA1 names of
 534tags of interest are stored under `ref/tags/`.  A special ref named
 535`HEAD` contains the name of the currently checked-out branch.
 536
 537The index file is initialized with a list of all paths and, for each
 538path, a blob object and a set of attributes.  The blob object represents
 539the contents of the file as of the head of the current branch.  The
 540attributes (last modified time, size, etc.) are taken from the
 541corresponding file in the working tree.  Subsequent changes to the
 542working tree can be found by comparing these attributes.  The index may
 543be updated with new content, and new commits may be created from the
 544content stored in the index.
 545
 546The index is also capable of storing multiple entries (called "stages")
 547for a given pathname.  These stages are used to hold the various
 548unmerged version of a file when a merge is in progress.
 549
 550Authors
 551-------
 552* git's founding father is Linus Torvalds <torvalds@osdl.org>.
 553* The current git nurse is Junio C Hamano <gitster@pobox.com>.
 554* The git potty was written by Andreas Ericsson <ae@op5.se>.
 555* General upbringing is handled by the git-list <git@vger.kernel.org>.
 556
 557Documentation
 558--------------
 559The documentation for git suite was started by David Greaves
 560<david@dgreaves.com>, and later enhanced greatly by the
 561contributors on the git-list <git@vger.kernel.org>.
 562
 563GIT
 564---
 565Part of the linkgit:git[7] suite