git.txt 22.4 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

J
Junio C Hamano 已提交
47 48 49 50 51
* link:v1.7.1/git.html[documentation for release 1.7.1]

* release notes for
  link:RelNotes-1.7.1.txt[1.7.1].

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

* release notes for
J
Junio C Hamano 已提交
55
  link:RelNotes-1.7.0.7.txt[1.7.0.7],
J
Junio C Hamano 已提交
56
  link:RelNotes-1.7.0.6.txt[1.7.0.6],
J
Junio C Hamano 已提交
57
  link:RelNotes-1.7.0.5.txt[1.7.0.5],
J
Junio C Hamano 已提交
58
  link:RelNotes-1.7.0.4.txt[1.7.0.4],
J
Junio C Hamano 已提交
59
  link:RelNotes-1.7.0.3.txt[1.7.0.3],
J
Junio C Hamano 已提交
60
  link:RelNotes-1.7.0.2.txt[1.7.0.2],
J
Junio C Hamano 已提交
61
  link:RelNotes-1.7.0.1.txt[1.7.0.1],
J
Junio C Hamano 已提交
62 63
  link:RelNotes-1.7.0.txt[1.7.0].

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

* release notes for
J
Junio C Hamano 已提交
67
  link:RelNotes-1.6.6.2.txt[1.6.6.2],
J
Junio C Hamano 已提交
68
  link:RelNotes-1.6.6.1.txt[1.6.6.1],
J
Junio C Hamano 已提交
69 70
  link:RelNotes-1.6.6.txt[1.6.6].

J
Junio C Hamano 已提交
71
* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
J
Junio C Hamano 已提交
72 73

* release notes for
J
Junio C Hamano 已提交
74
  link:RelNotes-1.6.5.8.txt[1.6.5.8],
J
Junio C Hamano 已提交
75
  link:RelNotes-1.6.5.7.txt[1.6.5.7],
J
Junio C Hamano 已提交
76
  link:RelNotes-1.6.5.6.txt[1.6.5.6],
J
Junio C Hamano 已提交
77
  link:RelNotes-1.6.5.5.txt[1.6.5.5],
J
Junio C Hamano 已提交
78
  link:RelNotes-1.6.5.4.txt[1.6.5.4],
J
Junio C Hamano 已提交
79
  link:RelNotes-1.6.5.3.txt[1.6.5.3],
J
Junio C Hamano 已提交
80
  link:RelNotes-1.6.5.2.txt[1.6.5.2],
J
Junio C Hamano 已提交
81
  link:RelNotes-1.6.5.1.txt[1.6.5.1],
J
Junio C Hamano 已提交
82 83
  link:RelNotes-1.6.5.txt[1.6.5].

J
Junio C Hamano 已提交
84
* link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
J
Junio C Hamano 已提交
85 86

* release notes for
J
Junio C Hamano 已提交
87
  link:RelNotes-1.6.4.4.txt[1.6.4.4],
J
Junio C Hamano 已提交
88
  link:RelNotes-1.6.4.3.txt[1.6.4.3],
J
Junio C Hamano 已提交
89
  link:RelNotes-1.6.4.2.txt[1.6.4.2],
J
Junio C Hamano 已提交
90
  link:RelNotes-1.6.4.1.txt[1.6.4.1],
J
Junio C Hamano 已提交
91 92
  link:RelNotes-1.6.4.txt[1.6.4].

J
Junio C Hamano 已提交
93
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
94 95

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

* release notes for
J
Junio C Hamano 已提交
103 104
  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 已提交
105
  link:RelNotes-1.6.2.3.txt[1.6.2.3],
106
  link:RelNotes-1.6.2.2.txt[1.6.2.2],
J
Junio C Hamano 已提交
107
  link:RelNotes-1.6.2.1.txt[1.6.2.1],
J
Junio C Hamano 已提交
108 109
  link:RelNotes-1.6.2.txt[1.6.2].

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

* release notes for
J
Junio C Hamano 已提交
113 114
  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 已提交
115
  link:RelNotes-1.6.1.1.txt[1.6.1.1],
J
Junio C Hamano 已提交
116 117
  link:RelNotes-1.6.1.txt[1.6.1].

118
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
J
Junio C Hamano 已提交
119 120

* release notes for
121
  link:RelNotes-1.6.0.6.txt[1.6.0.6],
122
  link:RelNotes-1.6.0.5.txt[1.6.0.5],
123 124
  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 已提交
125 126
  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 已提交
127 128
  link:RelNotes-1.6.0.txt[1.6.0].

129
* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
J
Junio C Hamano 已提交
130 131

* release notes for
132
  link:RelNotes-1.5.6.6.txt[1.5.6.6],
J
Junio C Hamano 已提交
133
  link:RelNotes-1.5.6.5.txt[1.5.6.5],
J
Junio C Hamano 已提交
134 135 136 137
  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 已提交
138
  link:RelNotes-1.5.6.txt[1.5.6].
J
Junio C Hamano 已提交
139

140
* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
J
Junio C Hamano 已提交
141 142

* release notes for
143 144
  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 已提交
145
  link:RelNotes-1.5.5.4.txt[1.5.5.4],
J
Junio C Hamano 已提交
146
  link:RelNotes-1.5.5.3.txt[1.5.5.3],
147
  link:RelNotes-1.5.5.2.txt[1.5.5.2],
J
Junio C Hamano 已提交
148
  link:RelNotes-1.5.5.1.txt[1.5.5.1],
J
Junio C Hamano 已提交
149 150
  link:RelNotes-1.5.5.txt[1.5.5].

151
* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
152 153

* release notes for
154 155
  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 已提交
156
  link:RelNotes-1.5.4.5.txt[1.5.4.5],
157
  link:RelNotes-1.5.4.4.txt[1.5.4.4],
J
Junio C Hamano 已提交
158
  link:RelNotes-1.5.4.3.txt[1.5.4.3],
159
  link:RelNotes-1.5.4.2.txt[1.5.4.2],
160
  link:RelNotes-1.5.4.1.txt[1.5.4.1],
161 162
  link:RelNotes-1.5.4.txt[1.5.4].

J
Junio C Hamano 已提交
163
* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
164 165

* release notes for
J
Junio C Hamano 已提交
166
  link:RelNotes-1.5.3.8.txt[1.5.3.8],
J
Junio C Hamano 已提交
167
  link:RelNotes-1.5.3.7.txt[1.5.3.7],
168
  link:RelNotes-1.5.3.6.txt[1.5.3.6],
169
  link:RelNotes-1.5.3.5.txt[1.5.3.5],
170
  link:RelNotes-1.5.3.4.txt[1.5.3.4],
171
  link:RelNotes-1.5.3.3.txt[1.5.3.3],
172
  link:RelNotes-1.5.3.2.txt[1.5.3.2],
173 174
  link:RelNotes-1.5.3.1.txt[1.5.3.1],
  link:RelNotes-1.5.3.txt[1.5.3].
175

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

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

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

endif::stalenotes[]

217 218 219
OPTIONS
-------
--version::
F
Fredrik Kuivinen 已提交
220
	Prints the git suite version that the 'git' program came from.
221 222

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

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

239 240 241 242
--html-path::
	Print the path to wherever your git HTML documentation is installed
	and exit.

243 244
-p::
--paginate::
245 246 247 248
	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).
249

250 251 252
--no-pager::
	Do not pipe git output into a pager.

253 254
--git-dir=<path>::
	Set the path to the repository. This can also be controlled by
255 256
	setting the GIT_DIR environment variable. It can be an absolute
	path or relative path to current working directory.
257

258 259 260 261 262 263
--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
264 265 266 267 268 269
	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.
270

271
--bare::
272 273 274 275
	Treat the repository as a bare repository.  If GIT_DIR
	environment is not set, it is set to the current working
	directory.

276 277 278 279
--no-replace-objects::
	Do not use replacement refs to replace git objects. See
	linkgit:git-replace[1] for more information.

280

281 282
FURTHER DOCUMENTATION
---------------------
283

284 285
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 已提交
286

287
The link:user-manual.html#git-concepts[git concepts chapter of the
288
user-manual] and linkgit:gitcore-tutorial[7] both provide
289
introductions to the underlying git architecture.
290

291 292
See linkgit:gitworkflows[7] for an overview of recommended workflows.

293 294
See also the link:howto-index.html[howto] documents for some useful
examples.
295

296 297
The internals are documented in the
link:technical/api-index.html[GIT API documentation].
298

299 300
GIT COMMANDS
------------
301

302 303
We divide git into high level ("porcelain") commands and low level
("plumbing") commands.
304

305 306 307 308 309 310 311 312
High-level commands (porcelain)
-------------------------------

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

Main porcelain commands
~~~~~~~~~~~~~~~~~~~~~~~
313

314
include::cmds-mainporcelain.txt[]
315

316
Ancillary Commands
317
~~~~~~~~~~~~~~~~~~
318 319
Manipulators:

320
include::cmds-ancillarymanipulators.txt[]
321

322
Interrogators:
323

324
include::cmds-ancillaryinterrogators.txt[]
325

326 327 328 329 330 331 332 333 334 335

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

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

include::cmds-foreignscminterface.txt[]


336 337 338 339 340 341
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
342 343
might start by reading about linkgit:git-update-index[1] and
linkgit:git-read-tree[1].
344

345 346 347 348 349 350 351 352 353
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
354 355 356 357
the repository, index, and working tree), commands that interrogate and
compare objects, and commands that move objects and references between
repositories.

358

359 360 361
Manipulation commands
~~~~~~~~~~~~~~~~~~~~~

362
include::cmds-plumbingmanipulators.txt[]
363 364 365 366 367


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

368
include::cmds-plumbinginterrogators.txt[]
369 370 371 372 373 374 375 376

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


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

377
include::cmds-synchingrepositories.txt[]
378

379
The following are helper commands used by the above; end users
380 381 382 383 384 385 386 387 388 389 390 391 392
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[]

393

J
Junio C Hamano 已提交
394 395 396
Configuration Mechanism
-----------------------

J
Junio C Hamano 已提交
397
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
J
Junio C Hamano 已提交
398
is used to hold per-repository configuration options.  It is a
P
Pavel Roskin 已提交
399
simple text file modeled after `.ini` format familiar to some
J
Junio C Hamano 已提交
400 401 402 403
people.  Here is an example:

------------
#
J
Junio C Hamano 已提交
404
# A '#' or ';' character indicates a comment.
J
Junio C Hamano 已提交
405 406 407 408 409 410 411 412 413 414 415 416 417 418 419
#

; 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
420 421
their operation accordingly.  See linkgit:git-config[1] for a
list.
J
Junio C Hamano 已提交
422 423


424
Identifier Terminology
425 426
----------------------
<object>::
J
Junio C Hamano 已提交
427
	Indicates the object name for any type of object.
428 429

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

<tree>::
J
Junio C Hamano 已提交
433
	Indicates a tree object name.
434 435

<commit>::
J
Junio C Hamano 已提交
436
	Indicates a commit object name.
437 438

<tree-ish>::
J
Junio C Hamano 已提交
439
	Indicates a tree, commit or tag object name.  A
440 441 442
	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>.
443

444 445 446 447 448 449
<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>.

450 451
<type>::
	Indicates that an object type is required.
J
Junio C Hamano 已提交
452
	Currently one of: `blob`, `tree`, `commit`, or `tag`.
453 454

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

458 459
Symbolic Identifiers
--------------------
460
Any git command accepting any <object> can also use the following
461
symbolic notation:
462 463

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

467
<tag>::
J
Junio C Hamano 已提交
468 469 470
	a valid tag 'name'
	(i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).

471
<head>::
J
Junio C Hamano 已提交
472 473 474
	a valid head 'name'
	(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).

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

478 479 480 481

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

482
Please see the linkgit:gitrepository-layout[5] document.
483

484
Read linkgit:githooks[5] for more details about each hook.
485

486
Higher level SCMs may provide and manage additional information in the
J
Junio C Hamano 已提交
487
`$GIT_DIR`.
488

J
Junio C Hamano 已提交
489

490 491
Terminology
-----------
492
Please see linkgit:gitglossary[7].
493 494 495 496 497 498


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

499 500 501 502
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 已提交
503
git so take care if using Cogito etc.
504 505 506

'GIT_INDEX_FILE'::
	This environment allows the specification of an alternate
507 508
	index file. If not specified, the default of `$GIT_DIR/index`
	is used.
509 510 511 512 513 514 515 516 517 518

'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
519 520 521
	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.
522 523

'GIT_DIR'::
J
Junio C Hamano 已提交
524 525 526
	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.
527

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

535 536 537 538 539 540 541 542
'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.)

543 544 545 546 547 548 549
git Commits
~~~~~~~~~~~
'GIT_AUTHOR_NAME'::
'GIT_AUTHOR_EMAIL'::
'GIT_AUTHOR_DATE'::
'GIT_COMMITTER_NAME'::
'GIT_COMMITTER_EMAIL'::
550
'GIT_COMMITTER_DATE'::
551
'EMAIL'::
552
	see linkgit:git-commit-tree[1]
553 554 555

git Diffs
~~~~~~~~~
556
'GIT_DIFF_OPTS'::
557 558 559 560 561
	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.

562
'GIT_EXTERNAL_DIFF'::
563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585
	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>.
586

587 588
other
~~~~~
J
Jakub Narebski 已提交
589 590 591
'GIT_MERGE_VERBOSITY'::
	A number controlling the amount of output shown by
	the recursive merge strategy.  Overrides merge.verbosity.
592
	See linkgit:git-merge[1]
J
Jakub Narebski 已提交
593

594
'GIT_PAGER'::
595 596
	This environment variable overrides `$PAGER`. If it is set
	to an empty string or to the value "cat", git will not launch
597 598
	a pager.  See also the `core.pager` option in
	linkgit:git-config[1].
599

600
'GIT_SSH'::
601 602
	If this environment variable is set then 'git fetch'
	and 'git push' will use this command instead
603
	of 'ssh' when they need to connect to a remote system.
604
	The '$GIT_SSH' command will be given exactly two arguments:
605 606 607 608 609 610 611 612 613 614 615
	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.

616 617
'GIT_FLUSH'::
	If this environment variable is set to "1", then commands such
618 619
	as 'git blame' (in incremental mode), 'git rev-list', 'git log',
	and 'git whatchanged' will force a flush of the output stream
620 621 622 623 624 625
	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.

626
'GIT_TRACE'::
627 628
	If this variable is set to "1", "2" or "true" (comparison
	is case insensitive), git will print `trace:` messages on
629 630
	stderr telling about alias expansion, built-in command
	execution and external command execution.
631 632 633 634 635 636 637 638
	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.
639

J
Junio C Hamano 已提交
640 641
Discussion[[Discussion]]
------------------------
642 643 644

More detail on the following is available from the
link:user-manual.html#git-concepts[git concepts chapter of the
645
user-manual] and linkgit:gitcore-tutorial[7].
646 647 648 649 650 651 652 653 654 655

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

693 694
Authors
-------
695
* git's founding father is Linus Torvalds <torvalds@osdl.org>.
696
* The current git nurse is Junio C Hamano <gitster@pobox.com>.
J
Junio C Hamano 已提交
697
* The git potty was written by Andreas Ericsson <ae@op5.se>.
698
* General upbringing is handled by the git-list <git@vger.kernel.org>.
699 700 701

Documentation
--------------
702 703 704
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>.
705

706 707 708
SEE ALSO
--------
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
709
link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
710
linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
711 712
linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
linkgit:gitworkflows[7]
713

714 715
GIT
---
716
Part of the linkgit:git[1] suite