git.txt 21.7 KB
Newer Older
1
git(1)
2 3 4 5 6 7 8 9 10
======

NAME
----
git - the stupid content tracker


SYNOPSIS
--------
11
[verse]
12
'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
13
    [-p|--paginate|--no-pager] [--no-replace-objects]
14 15
    [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
    [--help] COMMAND [ARGS]
16 17 18

DESCRIPTION
-----------
19 20 21 22
Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

23
See linkgit:gittutorial[7] to get started, then see
24 25
link:everyday.html[Everyday Git] for a useful minimum set of commands, and
"man git-commandname" for documentation of each command.  CVS users may
26 27
also want to read linkgit:gitcvs-migration[7].  See
the link:user-manual.html[Git User's Manual] for a more in-depth
28
introduction.
29

P
Petr Baudis 已提交
30
The COMMAND is either a name of a Git command (see below) or an alias
31
as defined in the configuration file (see linkgit:git-config[1]).
P
Petr Baudis 已提交
32

33 34 35 36
Formatted and hyperlinked version of the latest git
documentation can be viewed at
`http://www.kernel.org/pub/software/scm/git/docs/`.

37 38 39 40
ifdef::stalenotes[]
[NOTE]
============

41 42 43 44
You are reading the documentation for the latest (possibly
unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
45

J
Junio C Hamano 已提交
46
* link:v1.6.6.1/git.html[documentation for release 1.6.6.1]
J
Junio C Hamano 已提交
47 48

* release notes for
J
Junio C Hamano 已提交
49
  link:RelNotes-1.6.6.1.txt[1.6.6.1],
J
Junio C Hamano 已提交
50 51
  link:RelNotes-1.6.6.txt[1.6.6].

J
Junio C Hamano 已提交
52
* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
J
Junio C Hamano 已提交
53 54

* release notes for
J
Junio C Hamano 已提交
55
  link:RelNotes-1.6.5.8.txt[1.6.5.8],
J
Junio C Hamano 已提交
56
  link:RelNotes-1.6.5.7.txt[1.6.5.7],
J
Junio C Hamano 已提交
57
  link:RelNotes-1.6.5.6.txt[1.6.5.6],
J
Junio C Hamano 已提交
58
  link:RelNotes-1.6.5.5.txt[1.6.5.5],
J
Junio C Hamano 已提交
59
  link:RelNotes-1.6.5.4.txt[1.6.5.4],
J
Junio C Hamano 已提交
60
  link:RelNotes-1.6.5.3.txt[1.6.5.3],
J
Junio C Hamano 已提交
61
  link:RelNotes-1.6.5.2.txt[1.6.5.2],
J
Junio C Hamano 已提交
62
  link:RelNotes-1.6.5.1.txt[1.6.5.1],
J
Junio C Hamano 已提交
63 64
  link:RelNotes-1.6.5.txt[1.6.5].

J
Junio C Hamano 已提交
65
* link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
J
Junio C Hamano 已提交
66 67

* release notes for
J
Junio C Hamano 已提交
68
  link:RelNotes-1.6.4.4.txt[1.6.4.4],
J
Junio C Hamano 已提交
69
  link:RelNotes-1.6.4.3.txt[1.6.4.3],
J
Junio C Hamano 已提交
70
  link:RelNotes-1.6.4.2.txt[1.6.4.2],
J
Junio C Hamano 已提交
71
  link:RelNotes-1.6.4.1.txt[1.6.4.1],
J
Junio C Hamano 已提交
72 73
  link:RelNotes-1.6.4.txt[1.6.4].

J
Junio C Hamano 已提交
74
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
75 76

* release notes for
J
Junio C Hamano 已提交
77
  link:RelNotes-1.6.3.4.txt[1.6.3.4],
J
Junio C Hamano 已提交
78
  link:RelNotes-1.6.3.3.txt[1.6.3.3],
79 80 81
  link:RelNotes-1.6.3.2.txt[1.6.3.2],
  link:RelNotes-1.6.3.1.txt[1.6.3.1],
  link:RelNotes-1.6.3.txt[1.6.3].
J
Junio C Hamano 已提交
82 83

* release notes for
J
Junio C Hamano 已提交
84 85
  link:RelNotes-1.6.2.5.txt[1.6.2.5],
  link:RelNotes-1.6.2.4.txt[1.6.2.4],
J
Junio C Hamano 已提交
86
  link:RelNotes-1.6.2.3.txt[1.6.2.3],
87
  link:RelNotes-1.6.2.2.txt[1.6.2.2],
J
Junio C Hamano 已提交
88
  link:RelNotes-1.6.2.1.txt[1.6.2.1],
J
Junio C Hamano 已提交
89 90
  link:RelNotes-1.6.2.txt[1.6.2].

J
Junio C Hamano 已提交
91
* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
J
Junio C Hamano 已提交
92 93

* release notes for
J
Junio C Hamano 已提交
94 95
  link:RelNotes-1.6.1.3.txt[1.6.1.3],
  link:RelNotes-1.6.1.2.txt[1.6.1.2],
J
Junio C Hamano 已提交
96
  link:RelNotes-1.6.1.1.txt[1.6.1.1],
J
Junio C Hamano 已提交
97 98
  link:RelNotes-1.6.1.txt[1.6.1].

99
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
J
Junio C Hamano 已提交
100 101

* release notes for
102
  link:RelNotes-1.6.0.6.txt[1.6.0.6],
103
  link:RelNotes-1.6.0.5.txt[1.6.0.5],
104 105
  link:RelNotes-1.6.0.4.txt[1.6.0.4],
  link:RelNotes-1.6.0.3.txt[1.6.0.3],
J
Junio C Hamano 已提交
106 107
  link:RelNotes-1.6.0.2.txt[1.6.0.2],
  link:RelNotes-1.6.0.1.txt[1.6.0.1],
J
Junio C Hamano 已提交
108 109
  link:RelNotes-1.6.0.txt[1.6.0].

110
* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
J
Junio C Hamano 已提交
111 112

* release notes for
113
  link:RelNotes-1.5.6.6.txt[1.5.6.6],
J
Junio C Hamano 已提交
114
  link:RelNotes-1.5.6.5.txt[1.5.6.5],
J
Junio C Hamano 已提交
115 116 117 118
  link:RelNotes-1.5.6.4.txt[1.5.6.4],
  link:RelNotes-1.5.6.3.txt[1.5.6.3],
  link:RelNotes-1.5.6.2.txt[1.5.6.2],
  link:RelNotes-1.5.6.1.txt[1.5.6.1],
J
Junio C Hamano 已提交
119
  link:RelNotes-1.5.6.txt[1.5.6].
J
Junio C Hamano 已提交
120

121
* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
J
Junio C Hamano 已提交
122 123

* release notes for
124 125
  link:RelNotes-1.5.5.6.txt[1.5.5.6],
  link:RelNotes-1.5.5.5.txt[1.5.5.5],
J
Junio C Hamano 已提交
126
  link:RelNotes-1.5.5.4.txt[1.5.5.4],
J
Junio C Hamano 已提交
127
  link:RelNotes-1.5.5.3.txt[1.5.5.3],
128
  link:RelNotes-1.5.5.2.txt[1.5.5.2],
J
Junio C Hamano 已提交
129
  link:RelNotes-1.5.5.1.txt[1.5.5.1],
J
Junio C Hamano 已提交
130 131
  link:RelNotes-1.5.5.txt[1.5.5].

132
* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
133 134

* release notes for
135 136
  link:RelNotes-1.5.4.7.txt[1.5.4.7],
  link:RelNotes-1.5.4.6.txt[1.5.4.6],
J
Junio C Hamano 已提交
137
  link:RelNotes-1.5.4.5.txt[1.5.4.5],
138
  link:RelNotes-1.5.4.4.txt[1.5.4.4],
J
Junio C Hamano 已提交
139
  link:RelNotes-1.5.4.3.txt[1.5.4.3],
140
  link:RelNotes-1.5.4.2.txt[1.5.4.2],
141
  link:RelNotes-1.5.4.1.txt[1.5.4.1],
142 143
  link:RelNotes-1.5.4.txt[1.5.4].

J
Junio C Hamano 已提交
144
* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
145 146

* release notes for
J
Junio C Hamano 已提交
147
  link:RelNotes-1.5.3.8.txt[1.5.3.8],
J
Junio C Hamano 已提交
148
  link:RelNotes-1.5.3.7.txt[1.5.3.7],
149
  link:RelNotes-1.5.3.6.txt[1.5.3.6],
150
  link:RelNotes-1.5.3.5.txt[1.5.3.5],
151
  link:RelNotes-1.5.3.4.txt[1.5.3.4],
152
  link:RelNotes-1.5.3.3.txt[1.5.3.3],
153
  link:RelNotes-1.5.3.2.txt[1.5.3.2],
154 155
  link:RelNotes-1.5.3.1.txt[1.5.3.1],
  link:RelNotes-1.5.3.txt[1.5.3].
156

J
Junio C Hamano 已提交
157 158
* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]

J
Junio C Hamano 已提交
159
* release notes for
160
  link:RelNotes-1.5.2.5.txt[1.5.2.5],
J
Junio C Hamano 已提交
161
  link:RelNotes-1.5.2.4.txt[1.5.2.4],
162
  link:RelNotes-1.5.2.3.txt[1.5.2.3],
163 164
  link:RelNotes-1.5.2.2.txt[1.5.2.2],
  link:RelNotes-1.5.2.1.txt[1.5.2.1],
J
Junio C Hamano 已提交
165 166 167 168 169 170 171
  link:RelNotes-1.5.2.txt[1.5.2].

* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]

* release notes for
  link:RelNotes-1.5.1.6.txt[1.5.1.6],
  link:RelNotes-1.5.1.5.txt[1.5.1.5],
172 173 174 175 176 177 178 179
  link:RelNotes-1.5.1.4.txt[1.5.1.4],
  link:RelNotes-1.5.1.3.txt[1.5.1.3],
  link:RelNotes-1.5.1.2.txt[1.5.1.2],
  link:RelNotes-1.5.1.1.txt[1.5.1.1],
  link:RelNotes-1.5.1.txt[1.5.1].

* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]

J
Junio C Hamano 已提交
180 181
* release notes for
  link:RelNotes-1.5.0.7.txt[1.5.0.7],
182 183 184 185 186 187 188 189 190 191 192
  link:RelNotes-1.5.0.6.txt[1.5.0.6],
  link:RelNotes-1.5.0.5.txt[1.5.0.5],
  link:RelNotes-1.5.0.3.txt[1.5.0.3],
  link:RelNotes-1.5.0.2.txt[1.5.0.2],
  link:RelNotes-1.5.0.1.txt[1.5.0.1],
  link:RelNotes-1.5.0.txt[1.5.0].

* documentation for release link:v1.4.4.4/git.html[1.4.4.4],
  link:v1.3.3/git.html[1.3.3],
  link:v1.2.6/git.html[1.2.6],
  link:v1.0.13/git.html[1.0.13].
193 194 195 196 197

============

endif::stalenotes[]

198 199 200
OPTIONS
-------
--version::
F
Fredrik Kuivinen 已提交
201
	Prints the git suite version that the 'git' program came from.
202 203

--help::
F
Fredrik Kuivinen 已提交
204
	Prints the synopsis and a list of the most commonly used
205 206 207
	commands. If the option '--all' or '-a' is given then all
	available commands are printed. If a git command is named this
	option will bring up the manual page for that command.
208 209
+
Other options are available to control how the manual page is
210
displayed. See linkgit:git-help[1] for more information,
211 212
because `git --help ...` is converted internally into `git
help ...`.
213 214

--exec-path::
F
Fredrik Kuivinen 已提交
215
	Path to wherever your core git programs are installed.
216
	This can also be controlled by setting the GIT_EXEC_PATH
J
Jonathan Nieder 已提交
217
	environment variable. If no path is given, 'git' will print
218 219
	the current setting and then exit.

220 221 222 223
--html-path::
	Print the path to wherever your git HTML documentation is installed
	and exit.

224 225
-p::
--paginate::
226 227
	Pipe all output into 'less' (or if set, $PAGER).

228 229 230
--no-pager::
	Do not pipe git output into a pager.

231 232
--git-dir=<path>::
	Set the path to the repository. This can also be controlled by
233 234
	setting the GIT_DIR environment variable. It can be an absolute
	path or relative path to current working directory.
235

236 237 238 239 240 241
--work-tree=<path>::
	Set the path to the working tree.  The value will not be
	used in combination with repositories found automatically in
	a .git directory (i.e. $GIT_DIR is not set).
	This can also be controlled by setting the GIT_WORK_TREE
	environment variable and the core.worktree configuration
242 243 244 245 246 247
	variable. It can be an absolute path or relative path to
	the directory specified by --git-dir or GIT_DIR.
	Note: If --git-dir or GIT_DIR are specified but none of
	--work-tree, GIT_WORK_TREE and core.worktree is specified,
	the current working directory is regarded as the top directory
	of your working tree.
248

249
--bare::
250 251 252 253
	Treat the repository as a bare repository.  If GIT_DIR
	environment is not set, it is set to the current working
	directory.

254 255 256 257
--no-replace-objects::
	Do not use replacement refs to replace git objects. See
	linkgit:git-replace[1] for more information.

258

259 260
FURTHER DOCUMENTATION
---------------------
261

262 263
See the references above to get started using git.  The following is
probably more detail than necessary for a first-time user.
J
Junio C Hamano 已提交
264

265
The link:user-manual.html#git-concepts[git concepts chapter of the
266
user-manual] and linkgit:gitcore-tutorial[7] both provide
267
introductions to the underlying git architecture.
268

269 270
See linkgit:gitworkflows[7] for an overview of recommended workflows.

271 272
See also the link:howto-index.html[howto] documents for some useful
examples.
273

274 275
The internals are documented in the
link:technical/api-index.html[GIT API documentation].
276

277 278
GIT COMMANDS
------------
279

280 281
We divide git into high level ("porcelain") commands and low level
("plumbing") commands.
282

283 284 285 286 287 288 289 290
High-level commands (porcelain)
-------------------------------

We separate the porcelain commands into the main commands and some
ancillary user utilities.

Main porcelain commands
~~~~~~~~~~~~~~~~~~~~~~~
291

292
include::cmds-mainporcelain.txt[]
293

294
Ancillary Commands
295
~~~~~~~~~~~~~~~~~~
296 297
Manipulators:

298
include::cmds-ancillarymanipulators.txt[]
299

300
Interrogators:
301

302
include::cmds-ancillaryinterrogators.txt[]
303

304 305 306 307 308 309 310 311 312 313

Interacting with Others
~~~~~~~~~~~~~~~~~~~~~~~

These commands are to interact with foreign SCM and with other
people via patch over e-mail.

include::cmds-foreignscminterface.txt[]


314 315 316 317 318 319
Low-level commands (plumbing)
-----------------------------

Although git includes its
own porcelain layer, its low-level commands are sufficient to support
development of alternative porcelains.  Developers of such porcelains
320 321
might start by reading about linkgit:git-update-index[1] and
linkgit:git-read-tree[1].
322

323 324 325 326 327 328 329 330 331
The interface (input, output, set of options and the semantics)
to these low-level commands are meant to be a lot more stable
than Porcelain level commands, because these commands are
primarily for scripted use.  The interface to Porcelain commands
on the other hand are subject to change in order to improve the
end user experience.

The following description divides
the low-level commands into commands that manipulate objects (in
332 333 334 335
the repository, index, and working tree), commands that interrogate and
compare objects, and commands that move objects and references between
repositories.

336

337 338 339
Manipulation commands
~~~~~~~~~~~~~~~~~~~~~

340
include::cmds-plumbingmanipulators.txt[]
341 342 343 344 345


Interrogation commands
~~~~~~~~~~~~~~~~~~~~~~

346
include::cmds-plumbinginterrogators.txt[]
347 348 349 350 351 352 353 354

In general, the interrogate commands do not touch the files in
the working tree.


Synching repositories
~~~~~~~~~~~~~~~~~~~~~

355
include::cmds-synchingrepositories.txt[]
356

357
The following are helper commands used by the above; end users
358 359 360 361 362 363 364 365 366 367 368 369 370
typically do not use them directly.

include::cmds-synchelpers.txt[]


Internal helper commands
~~~~~~~~~~~~~~~~~~~~~~~~

These are internal helper commands used by other commands; end
users typically do not use them directly.

include::cmds-purehelpers.txt[]

371

J
Junio C Hamano 已提交
372 373 374
Configuration Mechanism
-----------------------

J
Junio C Hamano 已提交
375
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
J
Junio C Hamano 已提交
376
is used to hold per-repository configuration options.  It is a
P
Pavel Roskin 已提交
377
simple text file modeled after `.ini` format familiar to some
J
Junio C Hamano 已提交
378 379 380 381
people.  Here is an example:

------------
#
J
Junio C Hamano 已提交
382
# A '#' or ';' character indicates a comment.
J
Junio C Hamano 已提交
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400
#

; core variables
[core]
	; Don't trust file modes
	filemode = false

; user identity
[user]
	name = "Junio C Hamano"
	email = "junkio@twinsun.com"

------------

Various commands read from the configuration file and adjust
their operation accordingly.


401
Identifier Terminology
402 403
----------------------
<object>::
J
Junio C Hamano 已提交
404
	Indicates the object name for any type of object.
405 406

<blob>::
J
Junio C Hamano 已提交
407
	Indicates a blob object name.
408 409

<tree>::
J
Junio C Hamano 已提交
410
	Indicates a tree object name.
411 412

<commit>::
J
Junio C Hamano 已提交
413
	Indicates a commit object name.
414 415

<tree-ish>::
J
Junio C Hamano 已提交
416
	Indicates a tree, commit or tag object name.  A
417 418 419
	command that takes a <tree-ish> argument ultimately wants to
	operate on a <tree> object but automatically dereferences
	<commit> and <tag> objects that point at a <tree>.
420

421 422 423 424 425 426
<commit-ish>::
	Indicates a commit or tag object name.  A
	command that takes a <commit-ish> argument ultimately wants to
	operate on a <commit> object but automatically dereferences
	<tag> objects that point at a <commit>.

427 428
<type>::
	Indicates that an object type is required.
J
Junio C Hamano 已提交
429
	Currently one of: `blob`, `tree`, `commit`, or `tag`.
430 431

<file>::
J
Junio C Hamano 已提交
432 433
	Indicates a filename - almost always relative to the
	root of the tree structure `GIT_INDEX_FILE` describes.
434

435 436
Symbolic Identifiers
--------------------
437
Any git command accepting any <object> can also use the following
438
symbolic notation:
439 440

HEAD::
J
Junio C Hamano 已提交
441 442 443
	indicates the head of the current branch (i.e. the
	contents of `$GIT_DIR/HEAD`).

444
<tag>::
J
Junio C Hamano 已提交
445 446 447
	a valid tag 'name'
	(i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).

448
<head>::
J
Junio C Hamano 已提交
449 450 451
	a valid head 'name'
	(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).

452
For a more complete list of ways to spell object names, see
453
"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
454

455 456 457 458

File/Directory Structure
------------------------

459
Please see the linkgit:gitrepository-layout[5] document.
460

461
Read linkgit:githooks[5] for more details about each hook.
462

463
Higher level SCMs may provide and manage additional information in the
J
Junio C Hamano 已提交
464
`$GIT_DIR`.
465

J
Junio C Hamano 已提交
466

467 468
Terminology
-----------
469
Please see linkgit:gitglossary[7].
470 471 472 473 474 475


Environment Variables
---------------------
Various git commands use the following environment variables:

476 477 478 479
The git Repository
~~~~~~~~~~~~~~~~~~
These environment variables apply to 'all' core git commands. Nb: it
is worth noting that they may be used/overridden by SCMS sitting above
J
Junio C Hamano 已提交
480
git so take care if using Cogito etc.
481 482 483

'GIT_INDEX_FILE'::
	This environment allows the specification of an alternate
484 485
	index file. If not specified, the default of `$GIT_DIR/index`
	is used.
486 487 488 489 490 491 492 493 494 495

'GIT_OBJECT_DIRECTORY'::
	If the object storage directory is specified via this
	environment variable then the sha1 directories are created
	underneath - otherwise the default `$GIT_DIR/objects`
	directory is used.

'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
	Due to the immutable nature of git objects, old objects can be
	archived into shared, read-only directories. This variable
496 497 498
	specifies a ":" separated (on Windows ";" separated) list
	of git object directories which can be used to search for git
	objects. New objects will not be written to these directories.
499 500

'GIT_DIR'::
J
Junio C Hamano 已提交
501 502 503
	If the 'GIT_DIR' environment variable is set then it
	specifies a path to use instead of the default `.git`
	for the base of the repository.
504

505 506 507 508 509 510 511
'GIT_WORK_TREE'::
	Set the path to the working tree.  The value will not be
	used in combination with repositories found automatically in
	a .git directory (i.e. $GIT_DIR is not set).
	This can also be controlled by the '--work-tree' command line
	option and the core.worktree configuration variable.

512 513 514 515 516 517 518 519
'GIT_CEILING_DIRECTORIES'::
	This should be a colon-separated list of absolute paths.
	If set, it is a list of directories that git should not chdir
	up into while looking for a repository directory.
	It will not exclude the current working directory or
	a GIT_DIR set on the command line or in the environment.
	(Useful for excluding slow-loading network directories.)

520 521 522 523 524 525 526
git Commits
~~~~~~~~~~~
'GIT_AUTHOR_NAME'::
'GIT_AUTHOR_EMAIL'::
'GIT_AUTHOR_DATE'::
'GIT_COMMITTER_NAME'::
'GIT_COMMITTER_EMAIL'::
527
'GIT_COMMITTER_DATE'::
528
'EMAIL'::
529
	see linkgit:git-commit-tree[1]
530 531 532

git Diffs
~~~~~~~~~
533
'GIT_DIFF_OPTS'::
534 535 536 537 538
	Only valid setting is "--unified=??" or "-u??" to set the
	number of context lines shown when a unified diff is created.
	This takes precedence over any "-U" or "--unified" option
	value passed on the git diff command line.

539
'GIT_EXTERNAL_DIFF'::
540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562
	When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
	program named by it is called, instead of the diff invocation
	described above.  For a path that is added, removed, or modified,
        'GIT_EXTERNAL_DIFF' is called with 7 parameters:

	path old-file old-hex old-mode new-file new-hex new-mode
+
where:

	<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
                         contents of <old|new>,
	<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
	<old|new>-mode:: are the octal representation of the file modes.

+
The file parameters can point at the user's working file
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
when a new file is added), or a temporary file (e.g. `old-file` in the
index).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the
temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
+
For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
parameter, <path>.
563

564 565
other
~~~~~
J
Jakub Narebski 已提交
566 567 568
'GIT_MERGE_VERBOSITY'::
	A number controlling the amount of output shown by
	the recursive merge strategy.  Overrides merge.verbosity.
569
	See linkgit:git-merge[1]
J
Jakub Narebski 已提交
570

571
'GIT_PAGER'::
572 573
	This environment variable overrides `$PAGER`. If it is set
	to an empty string or to the value "cat", git will not launch
574 575
	a pager.  See also the `core.pager` option in
	linkgit:git-config[1].
576

577
'GIT_SSH'::
578 579
	If this environment variable is set then 'git-fetch'
	and 'git-push' will use this command instead
580
	of 'ssh' when they need to connect to a remote system.
581
	The '$GIT_SSH' command will be given exactly two arguments:
582 583 584 585 586 587 588 589 590 591 592
	the 'username@host' (or just 'host') from the URL and the
	shell command to execute on that remote system.
+
To pass options to the program that you want to list in GIT_SSH
you will need to wrap the program and options into a shell script,
then set GIT_SSH to refer to the shell script.
+
Usually it is easier to configure any desired options through your
personal `.ssh/config` file.  Please consult your ssh documentation
for further details.

593 594
'GIT_FLUSH'::
	If this environment variable is set to "1", then commands such
595 596
	as 'git-blame' (in incremental mode), 'git-rev-list', 'git-log',
	and 'git-whatchanged' will force a flush of the output stream
597 598 599 600 601 602
	after each commit-oriented record have been flushed.   If this
	variable is set to "0", the output of these commands will be done
	using completely buffered I/O.   If this environment variable is
	not set, git will choose buffered or record-oriented flushing
	based on whether stdout appears to be redirected to a file or not.

603
'GIT_TRACE'::
604 605
	If this variable is set to "1", "2" or "true" (comparison
	is case insensitive), git will print `trace:` messages on
606 607
	stderr telling about alias expansion, built-in command
	execution and external command execution.
608 609 610 611 612 613 614 615
	If this variable is set to an integer value greater than 1
	and lower than 10 (strictly) then git will interpret this
	value as an open file descriptor and will try to write the
	trace messages into this file descriptor.
	Alternatively, if this variable is set to an absolute path
	(starting with a '/' character), git will interpret this
	as a file path and will try to write the trace messages
	into it.
616

J
Junio C Hamano 已提交
617 618
Discussion[[Discussion]]
------------------------
619 620 621

More detail on the following is available from the
link:user-manual.html#git-concepts[git concepts chapter of the
622
user-manual] and linkgit:gitcore-tutorial[7].
623 624 625 626 627 628 629 630 631 632

A git project normally consists of a working directory with a ".git"
subdirectory at the top level.  The .git directory contains, among other
things, a compressed object database representing the complete history
of the project, an "index" file which links that history to the current
contents of the working tree, and named pointers into that history such
as tags and branch heads.

The object database contains objects of three main types: blobs, which
hold file data; trees, which point to blobs and other trees to build up
R
Ralf Wildenhues 已提交
633
directory hierarchies; and commits, which each reference a single tree
634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652
and some number of parent commits.

The commit, equivalent to what other systems call a "changeset" or
"version", represents a step in the project's history, and each parent
represents an immediately preceding step.  Commits with more than one
parent represent merges of independent lines of development.

All objects are named by the SHA1 hash of their contents, normally
written as a string of 40 hex digits.  Such names are globally unique.
The entire history leading up to a commit can be vouched for by signing
just that commit.  A fourth object type, the tag, is provided for this
purpose.

When first created, objects are stored in individual files, but for
efficiency may later be compressed together into "pack files".

Named pointers called refs mark interesting points in history.  A ref
may contain the SHA1 name of an object or the name of another ref.  Refs
with names beginning `ref/head/` contain the SHA1 name of the most
R
Ralf Wildenhues 已提交
653
recent commit (or "head") of a branch under development.  SHA1 names of
654 655 656 657 658 659 660 661 662 663 664 665 666 667 668
tags of interest are stored under `ref/tags/`.  A special ref named
`HEAD` contains the name of the currently checked-out branch.

The index file is initialized with a list of all paths and, for each
path, a blob object and a set of attributes.  The blob object represents
the contents of the file as of the head of the current branch.  The
attributes (last modified time, size, etc.) are taken from the
corresponding file in the working tree.  Subsequent changes to the
working tree can be found by comparing these attributes.  The index may
be updated with new content, and new commits may be created from the
content stored in the index.

The index is also capable of storing multiple entries (called "stages")
for a given pathname.  These stages are used to hold the various
unmerged version of a file when a merge is in progress.
669

670 671
Authors
-------
672
* git's founding father is Linus Torvalds <torvalds@osdl.org>.
673
* The current git nurse is Junio C Hamano <gitster@pobox.com>.
J
Junio C Hamano 已提交
674
* The git potty was written by Andreas Ericsson <ae@op5.se>.
675
* General upbringing is handled by the git-list <git@vger.kernel.org>.
676 677 678

Documentation
--------------
679 680 681
The documentation for git suite was started by David Greaves
<david@dgreaves.com>, and later enhanced greatly by the
contributors on the git-list <git@vger.kernel.org>.
682

683 684 685
SEE ALSO
--------
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
686
link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
687
linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
688 689
linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
linkgit:gitworkflows[7]
690

691 692
GIT
---
693
Part of the linkgit:git[1] suite