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