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