git.txt 13.0 KB
Newer Older
1
git(7)
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]] [-p|--paginate]
13 14
    [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
    [--help] COMMAND [ARGS]
15 16 17

DESCRIPTION
-----------
18 19 20 21 22 23 24
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.

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

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

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

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

40 41 42 43
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:
44

45
* link:v1.5.2.2/git.html[documentation for release 1.5.2.2]
46

J
Junio C Hamano 已提交
47
* release notes for
48 49
  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 已提交
50 51 52 53 54 55 56
  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],
57 58 59 60 61 62 63 64
  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 已提交
65 66
* release notes for
  link:RelNotes-1.5.0.7.txt[1.5.0.7],
67 68 69 70 71 72 73 74 75 76 77
  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].
78 79 80 81 82

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

endif::stalenotes[]

83 84 85
OPTIONS
-------
--version::
F
Fredrik Kuivinen 已提交
86
	Prints the git suite version that the 'git' program came from.
87 88

--help::
F
Fredrik Kuivinen 已提交
89 90 91 92
	Prints the synopsis and a list of the most commonly used
	commands.  If a git command is named this option will bring up
	the man-page for that command. If the option '--all' or '-a' is
	given then all available commands are printed.
93 94

--exec-path::
F
Fredrik Kuivinen 已提交
95
	Path to wherever your core git programs are installed.
96 97 98 99
	This can also be controlled by setting the GIT_EXEC_PATH
	environment variable. If no path is given 'git' will print
	the current setting and then exit.

100 101 102 103 104 105 106
-p|--paginate::
	Pipe all output into 'less' (or if set, $PAGER).

--git-dir=<path>::
	Set the path to the repository. This can also be controlled by
	setting the GIT_DIR environment variable.

107 108 109 110 111 112 113 114
--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
	variable.

115 116
--bare::
	Same as --git-dir=`pwd`.
117

118 119
FURTHER DOCUMENTATION
---------------------
120

121 122
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 已提交
123

124 125 126
The <<Discussion,Discussion>> section below and the
link:core-tutorial.html[Core tutorial] both provide introductions to the
underlying git architecture.
127

128 129
See also the link:howto-index.html[howto] documents for some useful
examples.
130

131 132
GIT COMMANDS
------------
133

134 135
We divide git into high level ("porcelain") commands and low level
("plumbing") commands.
136

137 138 139 140 141 142 143 144
High-level commands (porcelain)
-------------------------------

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

Main porcelain commands
~~~~~~~~~~~~~~~~~~~~~~~
145

146
include::cmds-mainporcelain.txt[]
147

148
Ancillary Commands
149
~~~~~~~~~~~~~~~~~~
150 151
Manipulators:

152
include::cmds-ancillarymanipulators.txt[]
153

154
Interrogators:
155

156
include::cmds-ancillaryinterrogators.txt[]
157

158 159 160 161 162 163 164 165 166 167

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

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

include::cmds-foreignscminterface.txt[]


168 169 170 171 172 173 174 175 176
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
might start by reading about gitlink:git-update-index[1] and
gitlink:git-read-tree[1].

177 178 179 180 181 182 183 184 185
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
186 187 188 189
the repository, index, and working tree), commands that interrogate and
compare objects, and commands that move objects and references between
repositories.

190

191 192 193
Manipulation commands
~~~~~~~~~~~~~~~~~~~~~

194
include::cmds-plumbingmanipulators.txt[]
195 196 197 198 199


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

200
include::cmds-plumbinginterrogators.txt[]
201 202 203 204 205 206 207 208

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


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

209
include::cmds-synchingrepositories.txt[]
210

211 212 213 214 215 216 217 218 219 220 221 222 223 224
The following are helper programs used by the above; end users
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[]

225

J
Junio C Hamano 已提交
226 227 228
Configuration Mechanism
-----------------------

J
Junio C Hamano 已提交
229
Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
J
Junio C Hamano 已提交
230
is used to hold per-repository configuration options.  It is a
P
Pavel Roskin 已提交
231
simple text file modeled after `.ini` format familiar to some
J
Junio C Hamano 已提交
232 233 234 235
people.  Here is an example:

------------
#
J
Junio C Hamano 已提交
236
# A '#' or ';' character indicates a comment.
J
Junio C Hamano 已提交
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254
#

; 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.


255
Identifier Terminology
256 257
----------------------
<object>::
J
Junio C Hamano 已提交
258
	Indicates the object name for any type of object.
259 260

<blob>::
J
Junio C Hamano 已提交
261
	Indicates a blob object name.
262 263

<tree>::
J
Junio C Hamano 已提交
264
	Indicates a tree object name.
265 266

<commit>::
J
Junio C Hamano 已提交
267
	Indicates a commit object name.
268 269

<tree-ish>::
J
Junio C Hamano 已提交
270
	Indicates a tree, commit or tag object name.  A
271 272 273
	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>.
274

275 276 277 278 279 280
<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>.

281 282
<type>::
	Indicates that an object type is required.
J
Junio C Hamano 已提交
283
	Currently one of: `blob`, `tree`, `commit`, or `tag`.
284 285

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

289 290
Symbolic Identifiers
--------------------
291
Any git command accepting any <object> can also use the following
292
symbolic notation:
293 294

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

298
<tag>::
J
Junio C Hamano 已提交
299 300 301
	a valid tag 'name'
	(i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).

302
<head>::
J
Junio C Hamano 已提交
303 304 305
	a valid head 'name'
	(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).

306 307 308
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].

309 310 311 312

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

J
Junio C Hamano 已提交
313
Please see link:repository-layout.html[repository layout] document.
314

315 316
Read link:hooks.html[hooks] for more details about each hook.

317
Higher level SCMs may provide and manage additional information in the
J
Junio C Hamano 已提交
318
`$GIT_DIR`.
319

J
Junio C Hamano 已提交
320

321 322
Terminology
-----------
323
Please see link:glossary.html[glossary] document.
324 325 326 327 328 329


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

330 331 332 333
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 已提交
334
git so take care if using Cogito etc.
335 336 337

'GIT_INDEX_FILE'::
	This environment allows the specification of an alternate
338 339
	index file. If not specified, the default of `$GIT_DIR/index`
	is used.
340 341 342 343 344 345 346 347 348 349

'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
350
	specifies a ":" separated list of git object directories which
351 352 353 354
	can be used to search for git objects. New objects will not be
	written to these directories.

'GIT_DIR'::
J
Junio C Hamano 已提交
355 356 357
	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.
358

359 360 361 362 363 364 365
'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.

366 367 368 369 370 371 372
git Commits
~~~~~~~~~~~
'GIT_AUTHOR_NAME'::
'GIT_AUTHOR_EMAIL'::
'GIT_AUTHOR_DATE'::
'GIT_COMMITTER_NAME'::
'GIT_COMMITTER_EMAIL'::
373
'GIT_COMMITTER_DATE'::
374
'EMAIL'::
375
	see gitlink:git-commit-tree[1]
376 377 378

git Diffs
~~~~~~~~~
379
'GIT_DIFF_OPTS'::
380 381 382 383 384
	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.

385
'GIT_EXTERNAL_DIFF'::
386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408
	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>.
409

410 411
other
~~~~~
412 413 414
'GIT_PAGER'::
	This environment variable overrides `$PAGER`.

415 416 417 418 419 420 421 422 423 424
'GIT_FLUSH'::
	If this environment variable is set to "1", then commands such
	as git-blame (in incremental mode), git-rev-list, git-log,
	git-whatchanged, etc., will force a flush of the output stream
	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.

425
'GIT_TRACE'::
426 427
	If this variable is set to "1", "2" or "true" (comparison
	is case insensitive), git will print `trace:` messages on
428 429
	stderr telling about alias expansion, built-in command
	execution and external command execution.
430 431 432 433 434 435 436 437
	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.
438

J
Junio C Hamano 已提交
439 440
Discussion[[Discussion]]
------------------------
N
Nicolas Pitre 已提交
441
include::core-intro.txt[]
442

443 444
Authors
-------
445 446 447 448
* git's founding father is Linus Torvalds <torvalds@osdl.org>.
* The current git nurse is Junio C Hamano <junkio@cox.net>.
* The git potty was written by Andres Ericsson <ae@op5.se>.
* General upbringing is handled by the git-list <git@vger.kernel.org>.
449 450 451

Documentation
--------------
452 453 454
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>.
455 456 457

GIT
---
458
Part of the gitlink:git[7] suite