blob: 01c463101b9b212f002e10a0d9e89a2df12652a2 [file] [log] [blame]
Junio C Hamanof7c042d2008-06-06 22:50:531git(1)
Junio C Hamano1a4e8412005-12-27 08:17:232======
3
4NAME
5----
6git - the stupid content tracker
7
8
9SYNOPSIS
10--------
Junio C Hamano6b2cee12006-08-26 08:43:3111[verse]
Junio C Hamanob4a9ede2009-04-08 07:36:3212'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
Junio C Hamano3d23a0a2009-10-19 08:04:3013 [-p|--paginate|--no-pager] [--no-replace-objects]
Junio C Hamanod526ba92007-07-02 00:17:4214 [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
15 [--help] COMMAND [ARGS]
Junio C Hamano1a4e8412005-12-27 08:17:2316
17DESCRIPTION
18-----------
Junio C Hamanoe27fb932006-04-03 05:34:1019Git is a fast, scalable, distributed revision control system with an
20unusually rich command set that provides both high-level operations
21and full access to internals.
22
Junio C Hamanofce7c7e2008-07-02 03:06:3823See linkgit:gittutorial[7] to get started, then see
Junio C Hamanoe27fb932006-04-03 05:34:1024link:everyday.html[Everyday Git] for a useful minimum set of commands, and
25"man git-commandname" for documentation of each command. CVS users may
Junio C Hamanofce7c7e2008-07-02 03:06:3826also want to read linkgit:gitcvs-migration[7]. See
27the link:user-manual.html[Git User's Manual] for a more in-depth
Junio C Hamano3d30fd52007-05-08 00:32:5328introduction.
Junio C Hamano1a4e8412005-12-27 08:17:2329
Junio C Hamano33db4372006-06-07 19:51:4530The COMMAND is either a name of a Git command (see below) or an alias
Junio C Hamano35738e82008-01-07 07:55:4631as defined in the configuration file (see linkgit:git-config[1]).
Junio C Hamano33db4372006-06-07 19:51:4532
Junio C Hamanob63afff2007-05-01 03:05:5533Formatted and hyperlinked version of the latest git
34documentation can be viewed at
35`http://www.kernel.org/pub/software/scm/git/docs/`.
36
Junio C Hamano9d52e572007-02-13 23:48:2037ifdef::stalenotes[]
38[NOTE]
39============
Junio C Hamano9d52e572007-02-13 23:48:2040
Junio C Hamanoa9b8d242007-05-19 04:51:5541You are reading the documentation for the latest (possibly
42unreleased) version of git, that is available from 'master'
43branch of the `git.git` repository.
44Documentation for older releases are available here:
Junio C Hamano2fc92602007-03-29 01:09:4645
Junio C Hamanodca34822010-02-13 01:02:5246* link:v1.7.0/git.html[documentation for release 1.7.0]
47
48* release notes for
49 link:RelNotes-1.7.0.txt[1.7.0].
50
Junio C Hamanoe7c7be32010-02-10 23:26:4851* link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
Junio C Hamanof3a01ab2009-12-24 00:30:3452
53* release notes for
Junio C Hamanoe7c7be32010-02-10 23:26:4854 link:RelNotes-1.6.6.2.txt[1.6.6.2],
Junio C Hamanoa9701f02010-01-21 00:42:1655 link:RelNotes-1.6.6.1.txt[1.6.6.1],
Junio C Hamanof3a01ab2009-12-24 00:30:3456 link:RelNotes-1.6.6.txt[1.6.6].
57
Junio C Hamanoa9701f02010-01-21 00:42:1658* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
Junio C Hamano77e01e32009-10-11 01:57:3459
60* release notes for
Junio C Hamanoa9701f02010-01-21 00:42:1661 link:RelNotes-1.6.5.8.txt[1.6.5.8],
Junio C Hamano6a548ef2009-12-17 00:16:2062 link:RelNotes-1.6.5.7.txt[1.6.5.7],
Junio C Hamano93362772009-12-11 06:01:1163 link:RelNotes-1.6.5.6.txt[1.6.5.6],
Junio C Hamanoe5574b62009-12-06 04:04:4564 link:RelNotes-1.6.5.5.txt[1.6.5.5],
Junio C Hamanofa2ad882009-12-03 09:15:4465 link:RelNotes-1.6.5.4.txt[1.6.5.4],
Junio C Hamanoe26ca7c2009-11-16 22:28:3166 link:RelNotes-1.6.5.3.txt[1.6.5.3],
Junio C Hamano621e1232009-10-26 05:16:4767 link:RelNotes-1.6.5.2.txt[1.6.5.2],
Junio C Hamanob71a22d2009-10-17 08:23:4768 link:RelNotes-1.6.5.1.txt[1.6.5.1],
Junio C Hamano77e01e32009-10-11 01:57:3469 link:RelNotes-1.6.5.txt[1.6.5].
70
Junio C Hamanofb44f812009-09-17 00:40:1771* link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
Junio C Hamano3bd4ce32009-06-04 07:18:0972
73* release notes for
Junio C Hamanofb44f812009-09-17 00:40:1774 link:RelNotes-1.6.4.4.txt[1.6.4.4],
Junio C Hamano7df6dcf2009-09-13 09:51:1775 link:RelNotes-1.6.4.3.txt[1.6.4.3],
Junio C Hamano68cfa3a2009-08-30 00:22:5576 link:RelNotes-1.6.4.2.txt[1.6.4.2],
Junio C Hamanofe24db02009-08-22 05:10:4777 link:RelNotes-1.6.4.1.txt[1.6.4.1],
Junio C Hamano543f8d62009-07-29 08:35:2178 link:RelNotes-1.6.4.txt[1.6.4].
79
80* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
81
82* release notes for
83 link:RelNotes-1.6.3.4.txt[1.6.3.4],
Junio C Hamanod848f832009-06-22 08:15:1284 link:RelNotes-1.6.3.3.txt[1.6.3.3],
Junio C Hamano3bd4ce32009-06-04 07:18:0985 link:RelNotes-1.6.3.2.txt[1.6.3.2],
86 link:RelNotes-1.6.3.1.txt[1.6.3.1],
87 link:RelNotes-1.6.3.txt[1.6.3].
Junio C Hamanoa9eca4e2009-03-04 08:29:5988
89* release notes for
Junio C Hamanobde411d2009-05-07 05:07:3190 link:RelNotes-1.6.2.5.txt[1.6.2.5],
91 link:RelNotes-1.6.2.4.txt[1.6.2.4],
Junio C Hamano98e32c32009-04-13 02:39:5392 link:RelNotes-1.6.2.3.txt[1.6.2.3],
93 link:RelNotes-1.6.2.2.txt[1.6.2.2],
Junio C Hamano064b4ab2009-03-15 22:16:1594 link:RelNotes-1.6.2.1.txt[1.6.2.1],
Junio C Hamanoa9eca4e2009-03-04 08:29:5995 link:RelNotes-1.6.2.txt[1.6.2].
96
Junio C Hamanoe5bf6c12009-02-07 21:43:1097* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
Junio C Hamano13016de2008-12-25 05:46:5798
99* release notes for
Junio C Hamanoe5bf6c12009-02-07 21:43:10100 link:RelNotes-1.6.1.3.txt[1.6.1.3],
101 link:RelNotes-1.6.1.2.txt[1.6.1.2],
Junio C Hamano20d47e32009-01-26 06:36:02102 link:RelNotes-1.6.1.1.txt[1.6.1.1],
Junio C Hamano13016de2008-12-25 05:46:57103 link:RelNotes-1.6.1.txt[1.6.1].
104
Junio C Hamano54bf1e22008-12-20 06:30:11105* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
Junio C Hamanoc6e59502008-08-17 21:05:51106
107* release notes for
Junio C Hamano54bf1e22008-12-20 06:30:11108 link:RelNotes-1.6.0.6.txt[1.6.0.6],
Junio C Hamanob4028862008-12-08 02:03:49109 link:RelNotes-1.6.0.5.txt[1.6.0.5],
Junio C Hamano9bd39c42008-11-13 01:54:44110 link:RelNotes-1.6.0.4.txt[1.6.0.4],
111 link:RelNotes-1.6.0.3.txt[1.6.0.3],
Junio C Hamano675570c2008-09-13 06:07:28112 link:RelNotes-1.6.0.2.txt[1.6.0.2],
113 link:RelNotes-1.6.0.1.txt[1.6.0.1],
Junio C Hamanoc6e59502008-08-17 21:05:51114 link:RelNotes-1.6.0.txt[1.6.0].
115
Junio C Hamano54bf1e22008-12-20 06:30:11116* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
Junio C Hamano11fe55c2008-06-18 23:14:56117
118* release notes for
Junio C Hamano54bf1e22008-12-20 06:30:11119 link:RelNotes-1.5.6.6.txt[1.5.6.6],
Junio C Hamanob53db3c2008-08-07 00:17:52120 link:RelNotes-1.5.6.5.txt[1.5.6.5],
Junio C Hamano915cd9b2008-07-20 01:24:17121 link:RelNotes-1.5.6.4.txt[1.5.6.4],
122 link:RelNotes-1.5.6.3.txt[1.5.6.3],
123 link:RelNotes-1.5.6.2.txt[1.5.6.2],
124 link:RelNotes-1.5.6.1.txt[1.5.6.1],
Junio C Hamano9eb57532008-06-26 06:33:46125 link:RelNotes-1.5.6.txt[1.5.6].
Junio C Hamano11fe55c2008-06-18 23:14:56126
Junio C Hamano54bf1e22008-12-20 06:30:11127* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
Junio C Hamano0d0679d2008-04-08 06:15:46128
129* release notes for
Junio C Hamano54bf1e22008-12-20 06:30:11130 link:RelNotes-1.5.5.6.txt[1.5.5.6],
131 link:RelNotes-1.5.5.5.txt[1.5.5.5],
Junio C Hamanoe2b205c2008-06-08 01:43:44132 link:RelNotes-1.5.5.4.txt[1.5.5.4],
Junio C Hamano99b28f22008-05-28 08:07:26133 link:RelNotes-1.5.5.3.txt[1.5.5.3],
Junio C Hamanob7a77fa2008-05-26 07:20:01134 link:RelNotes-1.5.5.2.txt[1.5.5.2],
Junio C Hamanoe3ddb5b2008-04-21 00:48:07135 link:RelNotes-1.5.5.1.txt[1.5.5.1],
Junio C Hamano0d0679d2008-04-08 06:15:46136 link:RelNotes-1.5.5.txt[1.5.5].
137
Junio C Hamano54bf1e22008-12-20 06:30:11138* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
Junio C Hamano7b9b4262008-02-02 06:48:39139
140* release notes for
Junio C Hamano54bf1e22008-12-20 06:30:11141 link:RelNotes-1.5.4.7.txt[1.5.4.7],
142 link:RelNotes-1.5.4.6.txt[1.5.4.6],
Junio C Hamano56033be2008-03-28 06:12:53143 link:RelNotes-1.5.4.5.txt[1.5.4.5],
Junio C Hamanobb343172008-03-09 10:39:09144 link:RelNotes-1.5.4.4.txt[1.5.4.4],
Junio C Hamanocb174dd2008-02-23 21:03:54145 link:RelNotes-1.5.4.3.txt[1.5.4.3],
Junio C Hamanoe670d0d2008-02-17 20:14:59146 link:RelNotes-1.5.4.2.txt[1.5.4.2],
Junio C Hamanoefe3c632008-02-14 00:51:31147 link:RelNotes-1.5.4.1.txt[1.5.4.1],
Junio C Hamano7b9b4262008-02-02 06:48:39148 link:RelNotes-1.5.4.txt[1.5.4].
149
Junio C Hamano4e272312008-01-08 09:13:21150* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
Junio C Hamanoa75069c2007-09-04 01:19:24151
152* release notes for
Junio C Hamano4e272312008-01-08 09:13:21153 link:RelNotes-1.5.3.8.txt[1.5.3.8],
Junio C Hamano976c0c42007-12-01 21:57:14154 link:RelNotes-1.5.3.7.txt[1.5.3.7],
Junio C Hamanoe1258662007-11-19 05:03:19155 link:RelNotes-1.5.3.6.txt[1.5.3.6],
Junio C Hamano1c708832007-11-02 02:47:50156 link:RelNotes-1.5.3.5.txt[1.5.3.5],
Junio C Hamanoea719cf2007-10-04 13:06:35157 link:RelNotes-1.5.3.4.txt[1.5.3.4],
Junio C Hamano58992c92007-10-01 16:23:18158 link:RelNotes-1.5.3.3.txt[1.5.3.3],
Junio C Hamano199cdf12007-09-19 18:30:47159 link:RelNotes-1.5.3.2.txt[1.5.3.2],
Junio C Hamano61210dd2007-10-24 11:52:13160 link:RelNotes-1.5.3.1.txt[1.5.3.1],
161 link:RelNotes-1.5.3.txt[1.5.3].
Junio C Hamano75485c82007-05-19 04:20:33162
Junio C Hamano9eb57532008-06-26 06:33:46163* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
164
Junio C Hamanoed7f4f62007-05-20 09:09:09165* release notes for
Junio C Hamano3b178be2007-08-16 04:59:27166 link:RelNotes-1.5.2.5.txt[1.5.2.5],
Junio C Hamano235d53f2007-07-13 00:25:15167 link:RelNotes-1.5.2.4.txt[1.5.2.4],
Junio C Hamano1d90cb02007-07-03 07:05:31168 link:RelNotes-1.5.2.3.txt[1.5.2.3],
Junio C Hamano29b1b922007-06-16 16:30:26169 link:RelNotes-1.5.2.2.txt[1.5.2.2],
170 link:RelNotes-1.5.2.1.txt[1.5.2.1],
Junio C Hamanoed7f4f62007-05-20 09:09:09171 link:RelNotes-1.5.2.txt[1.5.2].
172
173* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
174
175* release notes for
176 link:RelNotes-1.5.1.6.txt[1.5.1.6],
177 link:RelNotes-1.5.1.5.txt[1.5.1.5],
Junio C Hamanoa9b8d242007-05-19 04:51:55178 link:RelNotes-1.5.1.4.txt[1.5.1.4],
179 link:RelNotes-1.5.1.3.txt[1.5.1.3],
180 link:RelNotes-1.5.1.2.txt[1.5.1.2],
181 link:RelNotes-1.5.1.1.txt[1.5.1.1],
182 link:RelNotes-1.5.1.txt[1.5.1].
Junio C Hamano91d44c52007-05-09 07:16:07183
Junio C Hamanoa9b8d242007-05-19 04:51:55184* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
Junio C Hamano91d44c52007-05-09 07:16:07185
Junio C Hamanoed7f4f62007-05-20 09:09:09186* release notes for
187 link:RelNotes-1.5.0.7.txt[1.5.0.7],
Junio C Hamanoa9b8d242007-05-19 04:51:55188 link:RelNotes-1.5.0.6.txt[1.5.0.6],
189 link:RelNotes-1.5.0.5.txt[1.5.0.5],
190 link:RelNotes-1.5.0.3.txt[1.5.0.3],
191 link:RelNotes-1.5.0.2.txt[1.5.0.2],
192 link:RelNotes-1.5.0.1.txt[1.5.0.1],
193 link:RelNotes-1.5.0.txt[1.5.0].
Junio C Hamanoe90436a2007-04-22 07:22:13194
Junio C Hamanoa9b8d242007-05-19 04:51:55195* documentation for release link:v1.4.4.4/git.html[1.4.4.4],
196 link:v1.3.3/git.html[1.3.3],
197 link:v1.2.6/git.html[1.2.6],
198 link:v1.0.13/git.html[1.0.13].
Junio C Hamano9d52e572007-02-13 23:48:20199
200============
201
202endif::stalenotes[]
203
Junio C Hamano1a4e8412005-12-27 08:17:23204OPTIONS
205-------
206--version::
Junio C Hamano01078922006-03-10 00:31:47207Prints the git suite version that the 'git' program came from.
Junio C Hamano1a4e8412005-12-27 08:17:23208
209--help::
Junio C Hamano01078922006-03-10 00:31:47210Prints the synopsis and a list of the most commonly used
Junio C Hamano58256872007-12-04 08:31:13211commands. If the option '--all' or '-a' is given then all
212available commands are printed. If a git command is named this
213option will bring up the manual page for that command.
Junio C Hamano0c0da5f2007-12-13 02:45:30214+
215Other options are available to control how the manual page is
Junio C Hamano35738e82008-01-07 07:55:46216displayed. See linkgit:git-help[1] for more information,
Junio C Hamanoba4b9282008-07-06 05:20:31217because `git --help ...` is converted internally into `git
218help ...`.
Junio C Hamano1a4e8412005-12-27 08:17:23219
220--exec-path::
Junio C Hamano01078922006-03-10 00:31:47221Path to wherever your core git programs are installed.
Junio C Hamano1a4e8412005-12-27 08:17:23222This can also be controlled by setting the GIT_EXEC_PATH
Junio C Hamanoba4b9282008-07-06 05:20:31223environment variable. If no path is given, 'git' will print
Junio C Hamano1a4e8412005-12-27 08:17:23224the current setting and then exit.
225
Junio C Hamanob4a9ede2009-04-08 07:36:32226--html-path::
227Print the path to wherever your git HTML documentation is installed
228and exit.
229
Junio C Hamanoeb415992008-06-08 22:49:47230-p::
231--paginate::
Junio C Hamanof870ef82006-07-29 09:10:13232Pipe all output into 'less' (or if set, $PAGER).
233
Junio C Hamanocae86272007-08-21 02:20:49234--no-pager::
235Do not pipe git output into a pager.
236
Junio C Hamanof870ef82006-07-29 09:10:13237--git-dir=<path>::
238Set the path to the repository. This can also be controlled by
Junio C Hamano7d575a52008-04-30 08:45:27239setting the GIT_DIR environment variable. It can be an absolute
240path or relative path to current working directory.
Junio C Hamanof870ef82006-07-29 09:10:13241
Junio C Hamanod526ba92007-07-02 00:17:42242--work-tree=<path>::
243Set the path to the working tree. The value will not be
244used in combination with repositories found automatically in
245a .git directory (i.e. $GIT_DIR is not set).
246This can also be controlled by setting the GIT_WORK_TREE
247environment variable and the core.worktree configuration
Junio C Hamano7d575a52008-04-30 08:45:27248variable. It can be an absolute path or relative path to
249the directory specified by --git-dir or GIT_DIR.
250Note: If --git-dir or GIT_DIR are specified but none of
251--work-tree, GIT_WORK_TREE and core.worktree is specified,
252the current working directory is regarded as the top directory
253of your working tree.
Junio C Hamanod526ba92007-07-02 00:17:42254
Junio C Hamanof870ef82006-07-29 09:10:13255--bare::
Junio C Hamanoc435b1c2007-08-28 06:25:35256Treat the repository as a bare repository. If GIT_DIR
257environment is not set, it is set to the current working
258directory.
259
Junio C Hamano3d23a0a2009-10-19 08:04:30260--no-replace-objects::
261Do not use replacement refs to replace git objects. See
262linkgit:git-replace[1] for more information.
263
Junio C Hamano1a4e8412005-12-27 08:17:23264
Junio C Hamanoe27fb932006-04-03 05:34:10265FURTHER DOCUMENTATION
266---------------------
Junio C Hamano1a4e8412005-12-27 08:17:23267
Junio C Hamanoe27fb932006-04-03 05:34:10268See the references above to get started using git. The following is
269probably more detail than necessary for a first-time user.
Junio C Hamano1a4e8412005-12-27 08:17:23270
Junio C Hamano597ffcf2007-09-17 17:33:15271The link:user-manual.html#git-concepts[git concepts chapter of the
Junio C Hamanofce7c7e2008-07-02 03:06:38272user-manual] and linkgit:gitcore-tutorial[7] both provide
Junio C Hamano597ffcf2007-09-17 17:33:15273introductions to the underlying git architecture.
Junio C Hamano1a4e8412005-12-27 08:17:23274
Junio C Hamano804b5212009-06-07 16:05:03275See linkgit:gitworkflows[7] for an overview of recommended workflows.
276
Junio C Hamanoe27fb932006-04-03 05:34:10277See also the link:howto-index.html[howto] documents for some useful
278examples.
Junio C Hamano1a4e8412005-12-27 08:17:23279
Junio C Hamanofce7c7e2008-07-02 03:06:38280The internals are documented in the
281link:technical/api-index.html[GIT API documentation].
Junio C Hamano3dac5042007-12-15 08:40:54282
Junio C Hamanoe27fb932006-04-03 05:34:10283GIT COMMANDS
284------------
Junio C Hamano1a4e8412005-12-27 08:17:23285
Junio C Hamanoe27fb932006-04-03 05:34:10286We divide git into high level ("porcelain") commands and low level
287("plumbing") commands.
Junio C Hamano1a4e8412005-12-27 08:17:23288
Junio C Hamanob19b4f02006-10-29 20:47:22289High-level commands (porcelain)
290-------------------------------
291
292We separate the porcelain commands into the main commands and some
293ancillary user utilities.
294
295Main porcelain commands
296~~~~~~~~~~~~~~~~~~~~~~~
297
Junio C Hamano7c73c662007-01-19 00:37:50298include::cmds-mainporcelain.txt[]
Junio C Hamanob19b4f02006-10-29 20:47:22299
300Ancillary Commands
301~~~~~~~~~~~~~~~~~~
302Manipulators:
303
Junio C Hamano7c73c662007-01-19 00:37:50304include::cmds-ancillarymanipulators.txt[]
Junio C Hamanob19b4f02006-10-29 20:47:22305
306Interrogators:
307
Junio C Hamano7c73c662007-01-19 00:37:50308include::cmds-ancillaryinterrogators.txt[]
Junio C Hamanob19b4f02006-10-29 20:47:22309
Junio C Hamano4ad294b2007-01-20 02:22:50310
311Interacting with Others
312~~~~~~~~~~~~~~~~~~~~~~~
313
314These commands are to interact with foreign SCM and with other
315people via patch over e-mail.
316
317include::cmds-foreignscminterface.txt[]
318
319
Junio C Hamanoe27fb932006-04-03 05:34:10320Low-level commands (plumbing)
321-----------------------------
Junio C Hamano1a4e8412005-12-27 08:17:23322
Junio C Hamanoe27fb932006-04-03 05:34:10323Although git includes its
324own porcelain layer, its low-level commands are sufficient to support
325development of alternative porcelains. Developers of such porcelains
Junio C Hamano35738e82008-01-07 07:55:46326might start by reading about linkgit:git-update-index[1] and
327linkgit:git-read-tree[1].
Junio C Hamano1a4e8412005-12-27 08:17:23328
Junio C Hamano4ad294b2007-01-20 02:22:50329The interface (input, output, set of options and the semantics)
330to these low-level commands are meant to be a lot more stable
331than Porcelain level commands, because these commands are
332primarily for scripted use. The interface to Porcelain commands
333on the other hand are subject to change in order to improve the
334end user experience.
335
336The following description divides
337the low-level commands into commands that manipulate objects (in
Junio C Hamanoe27fb932006-04-03 05:34:10338the repository, index, and working tree), commands that interrogate and
339compare objects, and commands that move objects and references between
340repositories.
Junio C Hamano1a4e8412005-12-27 08:17:23341
Junio C Hamano4ad294b2007-01-20 02:22:50342
Junio C Hamano1a4e8412005-12-27 08:17:23343Manipulation commands
344~~~~~~~~~~~~~~~~~~~~~
Junio C Hamano1a4e8412005-12-27 08:17:23345
Junio C Hamano7c73c662007-01-19 00:37:50346include::cmds-plumbingmanipulators.txt[]
Junio C Hamano1a4e8412005-12-27 08:17:23347
348
349Interrogation commands
350~~~~~~~~~~~~~~~~~~~~~~
351
Junio C Hamano7c73c662007-01-19 00:37:50352include::cmds-plumbinginterrogators.txt[]
Junio C Hamano1a4e8412005-12-27 08:17:23353
354In general, the interrogate commands do not touch the files in
355the working tree.
356
357
358Synching repositories
359~~~~~~~~~~~~~~~~~~~~~
360
Junio C Hamano7c73c662007-01-19 00:37:50361include::cmds-synchingrepositories.txt[]
Junio C Hamano1a4e8412005-12-27 08:17:23362
Junio C Hamano27a128b2009-08-13 01:23:00363The following are helper commands used by the above; end users
Junio C Hamano4ad294b2007-01-20 02:22:50364typically do not use them directly.
365
366include::cmds-synchelpers.txt[]
367
368
369Internal helper commands
370~~~~~~~~~~~~~~~~~~~~~~~~
371
372These are internal helper commands used by other commands; end
373users typically do not use them directly.
374
375include::cmds-purehelpers.txt[]
376
Junio C Hamano1a4e8412005-12-27 08:17:23377
Junio C Hamano1a4e8412005-12-27 08:17:23378Configuration Mechanism
379-----------------------
380
381Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
382is used to hold per-repository configuration options. It is a
Junio C Hamano51c2ab02006-07-09 20:38:54383simple text file modeled after `.ini` format familiar to some
Junio C Hamano1a4e8412005-12-27 08:17:23384people. Here is an example:
385
386------------
387#
388# A '#' or ';' character indicates a comment.
389#
390
391; core variables
392[core]
393; Don't trust file modes
394filemode = false
395
396; user identity
397[user]
398name = "Junio C Hamano"
399email = "junkio@twinsun.com"
400
401------------
402
403Various commands read from the configuration file and adjust
404their operation accordingly.
405
406
407Identifier Terminology
408----------------------
409<object>::
410Indicates the object name for any type of object.
411
412<blob>::
413Indicates a blob object name.
414
415<tree>::
416Indicates a tree object name.
417
418<commit>::
419Indicates a commit object name.
420
421<tree-ish>::
422Indicates a tree, commit or tag object name. A
423command that takes a <tree-ish> argument ultimately wants to
424operate on a <tree> object but automatically dereferences
425<commit> and <tag> objects that point at a <tree>.
426
Junio C Hamano60f8aa82007-03-06 09:58:26427<commit-ish>::
428Indicates a commit or tag object name. A
429command that takes a <commit-ish> argument ultimately wants to
430operate on a <commit> object but automatically dereferences
431<tag> objects that point at a <commit>.
432
Junio C Hamano1a4e8412005-12-27 08:17:23433<type>::
434Indicates that an object type is required.
435Currently one of: `blob`, `tree`, `commit`, or `tag`.
436
437<file>::
438Indicates a filename - almost always relative to the
439root of the tree structure `GIT_INDEX_FILE` describes.
440
441Symbolic Identifiers
442--------------------
443Any git command accepting any <object> can also use the following
444symbolic notation:
445
446HEAD::
447indicates the head of the current branch (i.e. the
448contents of `$GIT_DIR/HEAD`).
449
450<tag>::
451a valid tag 'name'
452(i.e. the contents of `$GIT_DIR/refs/tags/<tag>`).
453
454<head>::
455a valid head 'name'
456(i.e. the contents of `$GIT_DIR/refs/heads/<head>`).
457
Junio C Hamanoff4b4312006-10-25 22:55:31458For a more complete list of ways to spell object names, see
Junio C Hamano35738e82008-01-07 07:55:46459"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
Junio C Hamanoff4b4312006-10-25 22:55:31460
Junio C Hamano1a4e8412005-12-27 08:17:23461
462File/Directory Structure
463------------------------
464
Junio C Hamanofce7c7e2008-07-02 03:06:38465Please see the linkgit:gitrepository-layout[5] document.
Junio C Hamano1a4e8412005-12-27 08:17:23466
Junio C Hamanofce7c7e2008-07-02 03:06:38467Read linkgit:githooks[5] for more details about each hook.
Junio C Hamano818f7d62006-03-26 01:49:30468
Junio C Hamano1a4e8412005-12-27 08:17:23469Higher level SCMs may provide and manage additional information in the
470`$GIT_DIR`.
471
472
473Terminology
474-----------
Junio C Hamanofce7c7e2008-07-02 03:06:38475Please see linkgit:gitglossary[7].
Junio C Hamano1a4e8412005-12-27 08:17:23476
477
478Environment Variables
479---------------------
480Various git commands use the following environment variables:
481
482The git Repository
483~~~~~~~~~~~~~~~~~~
484These environment variables apply to 'all' core git commands. Nb: it
485is worth noting that they may be used/overridden by SCMS sitting above
486git so take care if using Cogito etc.
487
488'GIT_INDEX_FILE'::
489This environment allows the specification of an alternate
490index file. If not specified, the default of `$GIT_DIR/index`
491is used.
492
493'GIT_OBJECT_DIRECTORY'::
494If the object storage directory is specified via this
495environment variable then the sha1 directories are created
496underneath - otherwise the default `$GIT_DIR/objects`
497directory is used.
498
499'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
500Due to the immutable nature of git objects, old objects can be
501archived into shared, read-only directories. This variable
Junio C Hamano05bf9c52008-07-03 09:21:58502specifies a ":" separated (on Windows ";" separated) list
503of git object directories which can be used to search for git
504objects. New objects will not be written to these directories.
Junio C Hamano1a4e8412005-12-27 08:17:23505
506'GIT_DIR'::
507If the 'GIT_DIR' environment variable is set then it
508specifies a path to use instead of the default `.git`
509for the base of the repository.
510
Junio C Hamanod526ba92007-07-02 00:17:42511'GIT_WORK_TREE'::
512Set the path to the working tree. The value will not be
513used in combination with repositories found automatically in
514a .git directory (i.e. $GIT_DIR is not set).
515This can also be controlled by the '--work-tree' command line
516option and the core.worktree configuration variable.
517
Junio C Hamano15048272008-07-07 22:10:48518'GIT_CEILING_DIRECTORIES'::
519This should be a colon-separated list of absolute paths.
520If set, it is a list of directories that git should not chdir
521up into while looking for a repository directory.
522It will not exclude the current working directory or
523a GIT_DIR set on the command line or in the environment.
524(Useful for excluding slow-loading network directories.)
525
Junio C Hamano1a4e8412005-12-27 08:17:23526git Commits
527~~~~~~~~~~~
528'GIT_AUTHOR_NAME'::
529'GIT_AUTHOR_EMAIL'::
530'GIT_AUTHOR_DATE'::
531'GIT_COMMITTER_NAME'::
532'GIT_COMMITTER_EMAIL'::
Junio C Hamano469d60e2007-04-29 18:30:34533'GIT_COMMITTER_DATE'::
534'EMAIL'::
Junio C Hamano35738e82008-01-07 07:55:46535see linkgit:git-commit-tree[1]
Junio C Hamano1a4e8412005-12-27 08:17:23536
537git Diffs
538~~~~~~~~~
539'GIT_DIFF_OPTS'::
Junio C Hamano1c437122006-11-28 02:22:25540Only valid setting is "--unified=??" or "-u??" to set the
541number of context lines shown when a unified diff is created.
542This takes precedence over any "-U" or "--unified" option
543value passed on the git diff command line.
544
Junio C Hamano1a4e8412005-12-27 08:17:23545'GIT_EXTERNAL_DIFF'::
Junio C Hamano1c437122006-11-28 02:22:25546When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
547program named by it is called, instead of the diff invocation
548described above. For a path that is added, removed, or modified,
549 'GIT_EXTERNAL_DIFF' is called with 7 parameters:
550
551path old-file old-hex old-mode new-file new-hex new-mode
552+
553where:
554
555<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
556 contents of <old|new>,
557<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
558<old|new>-mode:: are the octal representation of the file modes.
559
560+
561The file parameters can point at the user's working file
562(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
563when a new file is added), or a temporary file (e.g. `old-file` in the
564index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the
565temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
566+
567For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
568parameter, <path>.
Junio C Hamano1a4e8412005-12-27 08:17:23569
Junio C Hamano7ccb9fd2006-07-15 01:38:40570other
571~~~~~
Junio C Hamano1e6e0062007-07-13 05:33:25572'GIT_MERGE_VERBOSITY'::
573A number controlling the amount of output shown by
574the recursive merge strategy. Overrides merge.verbosity.
Junio C Hamano35738e82008-01-07 07:55:46575See linkgit:git-merge[1]
Junio C Hamano1e6e0062007-07-13 05:33:25576
Junio C Hamano85e45fa2006-08-13 07:47:41577'GIT_PAGER'::
Junio C Hamanof6002a92007-07-20 10:28:22578This environment variable overrides `$PAGER`. If it is set
579to an empty string or to the value "cat", git will not launch
Junio C Hamano0551f6a2008-08-25 00:33:33580a pager. See also the `core.pager` option in
581linkgit:git-config[1].
Junio C Hamano85e45fa2006-08-13 07:47:41582
Junio C Hamano4cd1c0e2007-08-06 04:39:14583'GIT_SSH'::
Junio C Hamano1aa40d22010-01-21 17:46:43584If this environment variable is set then 'git fetch'
585and 'git push' will use this command instead
Junio C Hamanoba4b9282008-07-06 05:20:31586of 'ssh' when they need to connect to a remote system.
Junio C Hamanofce7c7e2008-07-02 03:06:38587The '$GIT_SSH' command will be given exactly two arguments:
Junio C Hamano4cd1c0e2007-08-06 04:39:14588the 'username@host' (or just 'host') from the URL and the
589shell command to execute on that remote system.
590+
591To pass options to the program that you want to list in GIT_SSH
592you will need to wrap the program and options into a shell script,
593then set GIT_SSH to refer to the shell script.
594+
595Usually it is easier to configure any desired options through your
596personal `.ssh/config` file. Please consult your ssh documentation
597for further details.
598
Junio C Hamano401939f2007-07-01 06:34:30599'GIT_FLUSH'::
600If this environment variable is set to "1", then commands such
Junio C Hamano1aa40d22010-01-21 17:46:43601as 'git blame' (in incremental mode), 'git rev-list', 'git log',
602and 'git whatchanged' will force a flush of the output stream
Junio C Hamano401939f2007-07-01 06:34:30603after each commit-oriented record have been flushed. If this
604variable is set to "0", the output of these commands will be done
605using completely buffered I/O. If this environment variable is
606not set, git will choose buffered or record-oriented flushing
607based on whether stdout appears to be redirected to a file or not.
608
Junio C Hamano7ccb9fd2006-07-15 01:38:40609'GIT_TRACE'::
Junio C Hamanoef4b48b2006-09-04 10:08:34610If this variable is set to "1", "2" or "true" (comparison
611is case insensitive), git will print `trace:` messages on
Junio C Hamano7ccb9fd2006-07-15 01:38:40612stderr telling about alias expansion, built-in command
613execution and external command execution.
Junio C Hamanoef4b48b2006-09-04 10:08:34614If this variable is set to an integer value greater than 1
615and lower than 10 (strictly) then git will interpret this
616value as an open file descriptor and will try to write the
617trace messages into this file descriptor.
618Alternatively, if this variable is set to an absolute path
619(starting with a '/' character), git will interpret this
620as a file path and will try to write the trace messages
621into it.
Junio C Hamano7ccb9fd2006-07-15 01:38:40622
Junio C Hamano1a4e8412005-12-27 08:17:23623Discussion[[Discussion]]
624------------------------
Junio C Hamano597ffcf2007-09-17 17:33:15625
626More detail on the following is available from the
627link:user-manual.html#git-concepts[git concepts chapter of the
Junio C Hamanofce7c7e2008-07-02 03:06:38628user-manual] and linkgit:gitcore-tutorial[7].
Junio C Hamano597ffcf2007-09-17 17:33:15629
630A git project normally consists of a working directory with a ".git"
631subdirectory at the top level. The .git directory contains, among other
632things, a compressed object database representing the complete history
633of the project, an "index" file which links that history to the current
634contents of the working tree, and named pointers into that history such
635as tags and branch heads.
636
637The object database contains objects of three main types: blobs, which
638hold file data; trees, which point to blobs and other trees to build up
Junio C Hamanofe986052007-12-19 07:33:38639directory hierarchies; and commits, which each reference a single tree
Junio C Hamano597ffcf2007-09-17 17:33:15640and some number of parent commits.
641
642The commit, equivalent to what other systems call a "changeset" or
643"version", represents a step in the project's history, and each parent
644represents an immediately preceding step. Commits with more than one
645parent represent merges of independent lines of development.
646
647All objects are named by the SHA1 hash of their contents, normally
648written as a string of 40 hex digits. Such names are globally unique.
649The entire history leading up to a commit can be vouched for by signing
650just that commit. A fourth object type, the tag, is provided for this
651purpose.
652
653When first created, objects are stored in individual files, but for
654efficiency may later be compressed together into "pack files".
655
656Named pointers called refs mark interesting points in history. A ref
657may contain the SHA1 name of an object or the name of another ref. Refs
658with names beginning `ref/head/` contain the SHA1 name of the most
Junio C Hamanofe986052007-12-19 07:33:38659recent commit (or "head") of a branch under development. SHA1 names of
Junio C Hamano597ffcf2007-09-17 17:33:15660tags of interest are stored under `ref/tags/`. A special ref named
661`HEAD` contains the name of the currently checked-out branch.
662
663The index file is initialized with a list of all paths and, for each
664path, a blob object and a set of attributes. The blob object represents
665the contents of the file as of the head of the current branch. The
666attributes (last modified time, size, etc.) are taken from the
667corresponding file in the working tree. Subsequent changes to the
668working tree can be found by comparing these attributes. The index may
669be updated with new content, and new commits may be created from the
670content stored in the index.
671
672The index is also capable of storing multiple entries (called "stages")
673for a given pathname. These stages are used to hold the various
674unmerged version of a file when a merge is in progress.
Junio C Hamano1a4e8412005-12-27 08:17:23675
676Authors
677-------
678* git's founding father is Linus Torvalds <torvalds@osdl.org>.
Junio C Hamanodbb64592007-09-01 11:17:39679* The current git nurse is Junio C Hamano <gitster@pobox.com>.
Junio C Hamanoe0facb92007-12-05 10:59:48680* The git potty was written by Andreas Ericsson <ae@op5.se>.
Junio C Hamano1a4e8412005-12-27 08:17:23681* General upbringing is handled by the git-list <git@vger.kernel.org>.
682
683Documentation
684--------------
685The documentation for git suite was started by David Greaves
686<david@dgreaves.com>, and later enhanced greatly by the
687contributors on the git-list <git@vger.kernel.org>.
688
Junio C Hamano9e1793f2008-06-02 07:31:16689SEE ALSO
690--------
691linkgit:gittutorial[7], linkgit:gittutorial-2[7],
Junio C Hamanoaf1987f2008-08-03 07:58:19692link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
Junio C Hamano9e1793f2008-06-02 07:31:16693linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
Junio C Hamano804b5212009-06-07 16:05:03694linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
695linkgit:gitworkflows[7]
Junio C Hamano9e1793f2008-06-02 07:31:16696
Junio C Hamano1a4e8412005-12-27 08:17:23697GIT
698---
Junio C Hamanof7c042d2008-06-06 22:50:53699Part of the linkgit:git[1] suite