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