git.txt 22.2 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.7.0.6/git.html[documentation for release 1.7.0.6]
J
Junio C Hamano 已提交
47 48

* release notes for
J
Junio C Hamano 已提交
49
  link:RelNotes-1.7.0.6.txt[1.7.0.6],
J
Junio C Hamano 已提交
50
  link:RelNotes-1.7.0.5.txt[1.7.0.5],
J
Junio C Hamano 已提交
51
  link:RelNotes-1.7.0.4.txt[1.7.0.4],
J
Junio C Hamano 已提交
52
  link:RelNotes-1.7.0.3.txt[1.7.0.3],
J
Junio C Hamano 已提交
53
  link:RelNotes-1.7.0.2.txt[1.7.0.2],
J
Junio C Hamano 已提交
54
  link:RelNotes-1.7.0.1.txt[1.7.0.1],
J
Junio C Hamano 已提交
55 56
  link:RelNotes-1.7.0.txt[1.7.0].

J
Junio C Hamano 已提交
57
* link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
J
Junio C Hamano 已提交
58 59

* release notes for
J
Junio C Hamano 已提交
60
  link:RelNotes-1.6.6.2.txt[1.6.6.2],
J
Junio C Hamano 已提交
61
  link:RelNotes-1.6.6.1.txt[1.6.6.1],
J
Junio C Hamano 已提交
62 63
  link:RelNotes-1.6.6.txt[1.6.6].

J
Junio C Hamano 已提交
64
* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
J
Junio C Hamano 已提交
65 66

* release notes for
J
Junio C Hamano 已提交
67
  link:RelNotes-1.6.5.8.txt[1.6.5.8],
J
Junio C Hamano 已提交
68
  link:RelNotes-1.6.5.7.txt[1.6.5.7],
J
Junio C Hamano 已提交
69
  link:RelNotes-1.6.5.6.txt[1.6.5.6],
J
Junio C Hamano 已提交
70
  link:RelNotes-1.6.5.5.txt[1.6.5.5],
J
Junio C Hamano 已提交
71
  link:RelNotes-1.6.5.4.txt[1.6.5.4],
J
Junio C Hamano 已提交
72
  link:RelNotes-1.6.5.3.txt[1.6.5.3],
J
Junio C Hamano 已提交
73
  link:RelNotes-1.6.5.2.txt[1.6.5.2],
J
Junio C Hamano 已提交
74
  link:RelNotes-1.6.5.1.txt[1.6.5.1],
J
Junio C Hamano 已提交
75 76
  link:RelNotes-1.6.5.txt[1.6.5].

J
Junio C Hamano 已提交
77
* link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
J
Junio C Hamano 已提交
78 79

* release notes for
J
Junio C Hamano 已提交
80
  link:RelNotes-1.6.4.4.txt[1.6.4.4],
J
Junio C Hamano 已提交
81
  link:RelNotes-1.6.4.3.txt[1.6.4.3],
J
Junio C Hamano 已提交
82
  link:RelNotes-1.6.4.2.txt[1.6.4.2],
J
Junio C Hamano 已提交
83
  link:RelNotes-1.6.4.1.txt[1.6.4.1],
J
Junio C Hamano 已提交
84 85
  link:RelNotes-1.6.4.txt[1.6.4].

J
Junio C Hamano 已提交
86
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
87 88

* release notes for
J
Junio C Hamano 已提交
89
  link:RelNotes-1.6.3.4.txt[1.6.3.4],
J
Junio C Hamano 已提交
90
  link:RelNotes-1.6.3.3.txt[1.6.3.3],
91 92 93
  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 已提交
94 95

* release notes for
J
Junio C Hamano 已提交
96 97
  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 已提交
98
  link:RelNotes-1.6.2.3.txt[1.6.2.3],
99
  link:RelNotes-1.6.2.2.txt[1.6.2.2],
J
Junio C Hamano 已提交
100
  link:RelNotes-1.6.2.1.txt[1.6.2.1],
J
Junio C Hamano 已提交
101 102
  link:RelNotes-1.6.2.txt[1.6.2].

J
Junio C Hamano 已提交
103
* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
J
Junio C Hamano 已提交
104 105

* release notes for
J
Junio C Hamano 已提交
106 107
  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 已提交
108
  link:RelNotes-1.6.1.1.txt[1.6.1.1],
J
Junio C Hamano 已提交
109 110
  link:RelNotes-1.6.1.txt[1.6.1].

111
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
J
Junio C Hamano 已提交
112 113

* release notes for
114
  link:RelNotes-1.6.0.6.txt[1.6.0.6],
115
  link:RelNotes-1.6.0.5.txt[1.6.0.5],
116 117
  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 已提交
118 119
  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 已提交
120 121
  link:RelNotes-1.6.0.txt[1.6.0].

122
* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
J
Junio C Hamano 已提交
123 124

* release notes for
125
  link:RelNotes-1.5.6.6.txt[1.5.6.6],
J
Junio C Hamano 已提交
126
  link:RelNotes-1.5.6.5.txt[1.5.6.5],
J
Junio C Hamano 已提交
127 128 129 130
  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 已提交
131
  link:RelNotes-1.5.6.txt[1.5.6].
J
Junio C Hamano 已提交
132

133
* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
J
Junio C Hamano 已提交
134 135

* release notes for
136 137
  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 已提交
138
  link:RelNotes-1.5.5.4.txt[1.5.5.4],
J
Junio C Hamano 已提交
139
  link:RelNotes-1.5.5.3.txt[1.5.5.3],
140
  link:RelNotes-1.5.5.2.txt[1.5.5.2],
J
Junio C Hamano 已提交
141
  link:RelNotes-1.5.5.1.txt[1.5.5.1],
J
Junio C Hamano 已提交
142 143
  link:RelNotes-1.5.5.txt[1.5.5].

144
* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
145 146

* release notes for
147 148
  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 已提交
149
  link:RelNotes-1.5.4.5.txt[1.5.4.5],
150
  link:RelNotes-1.5.4.4.txt[1.5.4.4],
J
Junio C Hamano 已提交
151
  link:RelNotes-1.5.4.3.txt[1.5.4.3],
152
  link:RelNotes-1.5.4.2.txt[1.5.4.2],
153
  link:RelNotes-1.5.4.1.txt[1.5.4.1],
154 155
  link:RelNotes-1.5.4.txt[1.5.4].

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

* release notes for
J
Junio C Hamano 已提交
159
  link:RelNotes-1.5.3.8.txt[1.5.3.8],
J
Junio C Hamano 已提交
160
  link:RelNotes-1.5.3.7.txt[1.5.3.7],
161
  link:RelNotes-1.5.3.6.txt[1.5.3.6],
162
  link:RelNotes-1.5.3.5.txt[1.5.3.5],
163
  link:RelNotes-1.5.3.4.txt[1.5.3.4],
164
  link:RelNotes-1.5.3.3.txt[1.5.3.3],
165
  link:RelNotes-1.5.3.2.txt[1.5.3.2],
166 167
  link:RelNotes-1.5.3.1.txt[1.5.3.1],
  link:RelNotes-1.5.3.txt[1.5.3].
168

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

J
Junio C Hamano 已提交
171
* release notes for
172
  link:RelNotes-1.5.2.5.txt[1.5.2.5],
J
Junio C Hamano 已提交
173
  link:RelNotes-1.5.2.4.txt[1.5.2.4],
174
  link:RelNotes-1.5.2.3.txt[1.5.2.3],
175 176
  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 已提交
177 178 179 180 181 182 183
  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],
184 185 186 187 188 189 190 191
  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 已提交
192 193
* release notes for
  link:RelNotes-1.5.0.7.txt[1.5.0.7],
194 195 196 197 198 199 200 201 202 203 204
  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].
205 206 207 208 209

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

endif::stalenotes[]

210 211 212
OPTIONS
-------
--version::
F
Fredrik Kuivinen 已提交
213
	Prints the git suite version that the 'git' program came from.
214 215

--help::
F
Fredrik Kuivinen 已提交
216
	Prints the synopsis and a list of the most commonly used
217 218 219
	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.
220 221
+
Other options are available to control how the manual page is
222
displayed. See linkgit:git-help[1] for more information,
223 224
because `git --help ...` is converted internally into `git
help ...`.
225 226

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

232 233 234 235
--html-path::
	Print the path to wherever your git HTML documentation is installed
	and exit.

236 237
-p::
--paginate::
238 239 240 241
	Pipe all output into 'less' (or if set, $PAGER) if standard
	output is a terminal.  This overrides the `pager.<cmd>`
	configuration options (see the "Configuration Mechanism" section
	below).
242

243 244 245
--no-pager::
	Do not pipe git output into a pager.

246 247
--git-dir=<path>::
	Set the path to the repository. This can also be controlled by
248 249
	setting the GIT_DIR environment variable. It can be an absolute
	path or relative path to current working directory.
250

251 252 253 254 255 256
--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
257 258 259 260 261 262
	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.
263

264
--bare::
265 266 267 268
	Treat the repository as a bare repository.  If GIT_DIR
	environment is not set, it is set to the current working
	directory.

269 270 271 272
--no-replace-objects::
	Do not use replacement refs to replace git objects. See
	linkgit:git-replace[1] for more information.

273

274 275
FURTHER DOCUMENTATION
---------------------
276

277 278
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 已提交
279

280
The link:user-manual.html#git-concepts[git concepts chapter of the
281
user-manual] and linkgit:gitcore-tutorial[7] both provide
282
introductions to the underlying git architecture.
283

284 285
See linkgit:gitworkflows[7] for an overview of recommended workflows.

286 287
See also the link:howto-index.html[howto] documents for some useful
examples.
288

289 290
The internals are documented in the
link:technical/api-index.html[GIT API documentation].
291

292 293
GIT COMMANDS
------------
294

295 296
We divide git into high level ("porcelain") commands and low level
("plumbing") commands.
297

298 299 300 301 302 303 304 305
High-level commands (porcelain)
-------------------------------

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

Main porcelain commands
~~~~~~~~~~~~~~~~~~~~~~~
306

307
include::cmds-mainporcelain.txt[]
308

309
Ancillary Commands
310
~~~~~~~~~~~~~~~~~~
311 312
Manipulators:

313
include::cmds-ancillarymanipulators.txt[]
314

315
Interrogators:
316

317
include::cmds-ancillaryinterrogators.txt[]
318

319 320 321 322 323 324 325 326 327 328

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

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

include::cmds-foreignscminterface.txt[]


329 330 331 332 333 334
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
335 336
might start by reading about linkgit:git-update-index[1] and
linkgit:git-read-tree[1].
337

338 339 340 341 342 343 344 345 346
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
347 348 349 350
the repository, index, and working tree), commands that interrogate and
compare objects, and commands that move objects and references between
repositories.

351

352 353 354
Manipulation commands
~~~~~~~~~~~~~~~~~~~~~

355
include::cmds-plumbingmanipulators.txt[]
356 357 358 359 360


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

361
include::cmds-plumbinginterrogators.txt[]
362 363 364 365 366 367 368 369

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


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

370
include::cmds-synchingrepositories.txt[]
371

372
The following are helper commands used by the above; end users
373 374 375 376 377 378 379 380 381 382 383 384 385
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[]

386

J
Junio C Hamano 已提交
387 388 389
Configuration Mechanism
-----------------------

J
Junio C Hamano 已提交
390
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
J
Junio C Hamano 已提交
391
is used to hold per-repository configuration options.  It is a
P
Pavel Roskin 已提交
392
simple text file modeled after `.ini` format familiar to some
J
Junio C Hamano 已提交
393 394 395 396
people.  Here is an example:

------------
#
J
Junio C Hamano 已提交
397
# A '#' or ';' character indicates a comment.
J
Junio C Hamano 已提交
398 399 400 401 402 403 404 405 406 407 408 409 410 411 412
#

; 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
413 414
their operation accordingly.  See linkgit:git-config[1] for a
list.
J
Junio C Hamano 已提交
415 416


417
Identifier Terminology
418 419
----------------------
<object>::
J
Junio C Hamano 已提交
420
	Indicates the object name for any type of object.
421 422

<blob>::
J
Junio C Hamano 已提交
423
	Indicates a blob object name.
424 425

<tree>::
J
Junio C Hamano 已提交
426
	Indicates a tree object name.
427 428

<commit>::
J
Junio C Hamano 已提交
429
	Indicates a commit object name.
430 431

<tree-ish>::
J
Junio C Hamano 已提交
432
	Indicates a tree, commit or tag object name.  A
433 434 435
	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>.
436

437 438 439 440 441 442
<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>.

443 444
<type>::
	Indicates that an object type is required.
J
Junio C Hamano 已提交
445
	Currently one of: `blob`, `tree`, `commit`, or `tag`.
446 447

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

451 452
Symbolic Identifiers
--------------------
453
Any git command accepting any <object> can also use the following
454
symbolic notation:
455 456

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

460
<tag>::
J
Junio C Hamano 已提交
461 462 463
	a valid tag 'name'
	(i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).

464
<head>::
J
Junio C Hamano 已提交
465 466 467
	a valid head 'name'
	(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).

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

471 472 473 474

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

475
Please see the linkgit:gitrepository-layout[5] document.
476

477
Read linkgit:githooks[5] for more details about each hook.
478

479
Higher level SCMs may provide and manage additional information in the
J
Junio C Hamano 已提交
480
`$GIT_DIR`.
481

J
Junio C Hamano 已提交
482

483 484
Terminology
-----------
485
Please see linkgit:gitglossary[7].
486 487 488 489 490 491


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

492 493 494 495
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 已提交
496
git so take care if using Cogito etc.
497 498 499

'GIT_INDEX_FILE'::
	This environment allows the specification of an alternate
500 501
	index file. If not specified, the default of `$GIT_DIR/index`
	is used.
502 503 504 505 506 507 508 509 510 511

'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
512 513 514
	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.
515 516

'GIT_DIR'::
J
Junio C Hamano 已提交
517 518 519
	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.
520

521 522 523 524 525 526 527
'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.

528 529 530 531 532 533 534 535
'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.)

536 537 538 539 540 541 542
git Commits
~~~~~~~~~~~
'GIT_AUTHOR_NAME'::
'GIT_AUTHOR_EMAIL'::
'GIT_AUTHOR_DATE'::
'GIT_COMMITTER_NAME'::
'GIT_COMMITTER_EMAIL'::
543
'GIT_COMMITTER_DATE'::
544
'EMAIL'::
545
	see linkgit:git-commit-tree[1]
546 547 548

git Diffs
~~~~~~~~~
549
'GIT_DIFF_OPTS'::
550 551 552 553 554
	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.

555
'GIT_EXTERNAL_DIFF'::
556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578
	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>.
579

580 581
other
~~~~~
J
Jakub Narebski 已提交
582 583 584
'GIT_MERGE_VERBOSITY'::
	A number controlling the amount of output shown by
	the recursive merge strategy.  Overrides merge.verbosity.
585
	See linkgit:git-merge[1]
J
Jakub Narebski 已提交
586

587
'GIT_PAGER'::
588 589
	This environment variable overrides `$PAGER`. If it is set
	to an empty string or to the value "cat", git will not launch
590 591
	a pager.  See also the `core.pager` option in
	linkgit:git-config[1].
592

593
'GIT_SSH'::
594 595
	If this environment variable is set then 'git fetch'
	and 'git push' will use this command instead
596
	of 'ssh' when they need to connect to a remote system.
597
	The '$GIT_SSH' command will be given exactly two arguments:
598 599 600 601 602 603 604 605 606 607 608
	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.

609 610
'GIT_FLUSH'::
	If this environment variable is set to "1", then commands such
611 612
	as 'git blame' (in incremental mode), 'git rev-list', 'git log',
	and 'git whatchanged' will force a flush of the output stream
613 614 615 616 617 618
	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.

619
'GIT_TRACE'::
620 621
	If this variable is set to "1", "2" or "true" (comparison
	is case insensitive), git will print `trace:` messages on
622 623
	stderr telling about alias expansion, built-in command
	execution and external command execution.
624 625 626 627 628 629 630 631
	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.
632

J
Junio C Hamano 已提交
633 634
Discussion[[Discussion]]
------------------------
635 636 637

More detail on the following is available from the
link:user-manual.html#git-concepts[git concepts chapter of the
638
user-manual] and linkgit:gitcore-tutorial[7].
639 640 641 642 643 644 645 646 647 648

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 已提交
649
directory hierarchies; and commits, which each reference a single tree
650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668
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 已提交
669
recent commit (or "head") of a branch under development.  SHA1 names of
670 671 672 673 674 675 676 677 678 679 680 681 682 683 684
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.
685

686 687
Authors
-------
688
* git's founding father is Linus Torvalds <torvalds@osdl.org>.
689
* The current git nurse is Junio C Hamano <gitster@pobox.com>.
J
Junio C Hamano 已提交
690
* The git potty was written by Andreas Ericsson <ae@op5.se>.
691
* General upbringing is handled by the git-list <git@vger.kernel.org>.
692 693 694

Documentation
--------------
695 696 697
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>.
698

699 700 701
SEE ALSO
--------
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
702
link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
703
linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
704 705
linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
linkgit:gitworkflows[7]
706

707 708
GIT
---
709
Part of the linkgit:git[1] suite