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