]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git.txt
Documentation/git-stash.txt: add a missing verb
[thirdparty/git.git] / Documentation / git.txt
CommitLineData
9e1f0a85 1git(1)
2cf565c5 2======
2cf565c5
DG
3
4NAME
5----
6git - the stupid content tracker
7
8
9SYNOPSIS
10--------
8b70004b 11[verse]
68e4b552
ZJS
12'git' [--version] [--help] [-c <name>=<value>]
13 [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
d49483f0
JT
14 [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
15 [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
68e4b552 16 <command> [<args>]
2cf565c5
DG
17
18DESCRIPTION
19-----------
23091e95
BF
20Git is a fast, scalable, distributed revision control system with an
21unusually rich command set that provides both high-level operations
22and full access to internals.
23
6998e4db 24See linkgit:gittutorial[7] to get started, then see
7687ae98
JH
25link:everyday.html[Everyday Git] for a useful minimum set of
26commands. The link:user-manual.html[Git User's Manual] has a more
27in-depth introduction.
cb22bc44 28
7687ae98
JH
29After you mastered the basic concepts, you can come back to this
30page to learn what commands git offers. You can learn more about
31individual git commands with "git help command". linkgit:gitcli[7]
32manual page gives you an overview of the command line command syntax.
4514ad4f 33
7687ae98
JH
34Formatted and hyperlinked version of the latest git documentation
35can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
34b604af 36
26cfcfbf
JH
37ifdef::stalenotes[]
38[NOTE]
39============
26cfcfbf 40
2ff3f61a
JH
41You 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:
43a8e4fe 45
ed9fe755 46* link:v1.8.0.1/git.html[documentation for release 1.8.0.1]
8c7a786b
JH
47
48* release notes for
ed9fe755
JH
49 link:RelNotes/1.8.0.1.txt[1.8.0.1],
50 link:RelNotes/1.8.0.txt[1.8.0].
8c7a786b 51
7e201053 52* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
889d3589
JH
53
54* release notes for
7e201053 55 link:RelNotes/1.7.12.4.txt[1.7.12.4],
234cd456 56 link:RelNotes/1.7.12.3.txt[1.7.12.3],
d8cf053d 57 link:RelNotes/1.7.12.2.txt[1.7.12.2],
304b7d99 58 link:RelNotes/1.7.12.1.txt[1.7.12.1],
889d3589
JH
59 link:RelNotes/1.7.12.txt[1.7.12].
60
bafc478f 61* link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
0ce2e396
JH
62
63* release notes for
bafc478f 64 link:RelNotes/1.7.11.7.txt[1.7.11.7],
e09e4024 65 link:RelNotes/1.7.11.6.txt[1.7.11.6],
cd7c0be1 66 link:RelNotes/1.7.11.5.txt[1.7.11.5],
0e4c8822 67 link:RelNotes/1.7.11.4.txt[1.7.11.4],
e6dfbcf1 68 link:RelNotes/1.7.11.3.txt[1.7.11.3],
8d141a1d 69 link:RelNotes/1.7.11.2.txt[1.7.11.2],
0e64a95a 70 link:RelNotes/1.7.11.1.txt[1.7.11.1],
0ce2e396
JH
71 link:RelNotes/1.7.11.txt[1.7.11].
72
785ee496 73* link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
e8dde3e5
JH
74
75* release notes for
785ee496 76 link:RelNotes/1.7.10.5.txt[1.7.10.5],
121f71f0 77 link:RelNotes/1.7.10.4.txt[1.7.10.4],
6a6d72b1 78 link:RelNotes/1.7.10.3.txt[1.7.10.3],
b6555d73 79 link:RelNotes/1.7.10.2.txt[1.7.10.2],
bf505158 80 link:RelNotes/1.7.10.1.txt[1.7.10.1],
e8dde3e5
JH
81 link:RelNotes/1.7.10.txt[1.7.10].
82
d0f1ea60 83* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]
828ea97d
JH
84
85* release notes for
d0f1ea60 86 link:RelNotes/1.7.9.7.txt[1.7.9.7],
cb2ed324 87 link:RelNotes/1.7.9.6.txt[1.7.9.6],
8ced9c90 88 link:RelNotes/1.7.9.5.txt[1.7.9.5],
a4603481 89 link:RelNotes/1.7.9.4.txt[1.7.9.4],
69f4e08f 90 link:RelNotes/1.7.9.3.txt[1.7.9.3],
78f4c9f6 91 link:RelNotes/1.7.9.2.txt[1.7.9.2],
90020e3b 92 link:RelNotes/1.7.9.1.txt[1.7.9.1],
828ea97d
JH
93 link:RelNotes/1.7.9.txt[1.7.9].
94
d9f5ef7a 95* link:v1.7.8.6/git.html[documentation for release 1.7.8.6]
406da780
JH
96
97* release notes for
d9f5ef7a 98 link:RelNotes/1.7.8.6.txt[1.7.8.6],
cb2ed324 99 link:RelNotes/1.7.8.5.txt[1.7.8.5],
c572f491 100 link:RelNotes/1.7.8.4.txt[1.7.8.4],
5f4d133f
JH
101 link:RelNotes/1.7.8.3.txt[1.7.8.3],
102 link:RelNotes/1.7.8.2.txt[1.7.8.2],
103 link:RelNotes/1.7.8.1.txt[1.7.8.1],
406da780
JH
104 link:RelNotes/1.7.8.txt[1.7.8].
105
82588584 106* link:v1.7.7.7/git.html[documentation for release 1.7.7.7]
703f05ad
JH
107
108* release notes for
82588584 109 link:RelNotes/1.7.7.7.txt[1.7.7.7],
c572f491 110 link:RelNotes/1.7.7.6.txt[1.7.7.6],
66c11f02
JH
111 link:RelNotes/1.7.7.5.txt[1.7.7.5],
112 link:RelNotes/1.7.7.4.txt[1.7.7.4],
113 link:RelNotes/1.7.7.3.txt[1.7.7.3],
114 link:RelNotes/1.7.7.2.txt[1.7.7.2],
f7d958df 115 link:RelNotes/1.7.7.1.txt[1.7.7.1],
703f05ad
JH
116 link:RelNotes/1.7.7.txt[1.7.7].
117
f174a258 118* link:v1.7.6.6/git.html[documentation for release 1.7.6.6]
f696543d
JH
119
120* release notes for
f174a258 121 link:RelNotes/1.7.6.6.txt[1.7.6.6],
15b7898c 122 link:RelNotes/1.7.6.5.txt[1.7.6.5],
63205264 123 link:RelNotes/1.7.6.4.txt[1.7.6.4],
740a8fc2 124 link:RelNotes/1.7.6.3.txt[1.7.6.3],
509d5970
JH
125 link:RelNotes/1.7.6.2.txt[1.7.6.2],
126 link:RelNotes/1.7.6.1.txt[1.7.6.1],
f696543d
JH
127 link:RelNotes/1.7.6.txt[1.7.6].
128
e5af0de2 129* link:v1.7.5.4/git.html[documentation for release 1.7.5.4]
ec014eac
JH
130
131* release notes for
e5af0de2 132 link:RelNotes/1.7.5.4.txt[1.7.5.4],
3c3e0b3c 133 link:RelNotes/1.7.5.3.txt[1.7.5.3],
3d5ae435 134 link:RelNotes/1.7.5.2.txt[1.7.5.2],
2f312e88 135 link:RelNotes/1.7.5.1.txt[1.7.5.1],
ec014eac
JH
136 link:RelNotes/1.7.5.txt[1.7.5].
137
6ceb270c 138* link:v1.7.4.5/git.html[documentation for release 1.7.4.5]
7ed863a8
JH
139
140* release notes for
6ceb270c 141 link:RelNotes/1.7.4.5.txt[1.7.4.5],
6be05591 142 link:RelNotes/1.7.4.4.txt[1.7.4.4],
cb35c064
JH
143 link:RelNotes/1.7.4.3.txt[1.7.4.3],
144 link:RelNotes/1.7.4.2.txt[1.7.4.2],
9971d6d5 145 link:RelNotes/1.7.4.1.txt[1.7.4.1],
7ed863a8
JH
146 link:RelNotes/1.7.4.txt[1.7.4].
147
685e9d91 148* link:v1.7.3.5/git.html[documentation for release 1.7.3.5]
87b50542
JH
149
150* release notes for
685e9d91 151 link:RelNotes/1.7.3.5.txt[1.7.3.5],
15368e18 152 link:RelNotes/1.7.3.4.txt[1.7.3.4],
ed94cc76 153 link:RelNotes/1.7.3.3.txt[1.7.3.3],
8a904385 154 link:RelNotes/1.7.3.2.txt[1.7.3.2],
92c1e717 155 link:RelNotes/1.7.3.1.txt[1.7.3.1],
87b50542
JH
156 link:RelNotes/1.7.3.txt[1.7.3].
157
1b974346 158* link:v1.7.2.5/git.html[documentation for release 1.7.2.5]
64fdc08d
JH
159
160* release notes for
1b974346 161 link:RelNotes/1.7.2.5.txt[1.7.2.5],
ed94cc76 162 link:RelNotes/1.7.2.4.txt[1.7.2.4],
761e742d
NP
163 link:RelNotes/1.7.2.3.txt[1.7.2.3],
164 link:RelNotes/1.7.2.2.txt[1.7.2.2],
165 link:RelNotes/1.7.2.1.txt[1.7.2.1],
166 link:RelNotes/1.7.2.txt[1.7.2].
64fdc08d 167
1b974346 168* link:v1.7.1.4/git.html[documentation for release 1.7.1.4]
d599e048
JH
169
170* release notes for
1b974346 171 link:RelNotes/1.7.1.4.txt[1.7.1.4],
ed94cc76 172 link:RelNotes/1.7.1.3.txt[1.7.1.3],
761e742d
NP
173 link:RelNotes/1.7.1.2.txt[1.7.1.2],
174 link:RelNotes/1.7.1.1.txt[1.7.1.1],
175 link:RelNotes/1.7.1.txt[1.7.1].
d599e048 176
1b974346 177* link:v1.7.0.9/git.html[documentation for release 1.7.0.9]
e923eaeb
JH
178
179* release notes for
1b974346 180 link:RelNotes/1.7.0.9.txt[1.7.0.9],
ed94cc76 181 link:RelNotes/1.7.0.8.txt[1.7.0.8],
761e742d
NP
182 link:RelNotes/1.7.0.7.txt[1.7.0.7],
183 link:RelNotes/1.7.0.6.txt[1.7.0.6],
184 link:RelNotes/1.7.0.5.txt[1.7.0.5],
185 link:RelNotes/1.7.0.4.txt[1.7.0.4],
186 link:RelNotes/1.7.0.3.txt[1.7.0.3],
187 link:RelNotes/1.7.0.2.txt[1.7.0.2],
188 link:RelNotes/1.7.0.1.txt[1.7.0.1],
189 link:RelNotes/1.7.0.txt[1.7.0].
e923eaeb 190
1b974346 191* link:v1.6.6.3/git.html[documentation for release 1.6.6.3]
902f2353
JH
192
193* release notes for
1b974346 194 link:RelNotes/1.6.6.3.txt[1.6.6.3],
761e742d
NP
195 link:RelNotes/1.6.6.2.txt[1.6.6.2],
196 link:RelNotes/1.6.6.1.txt[1.6.6.1],
197 link:RelNotes/1.6.6.txt[1.6.6].
902f2353 198
1b974346 199* link:v1.6.5.9/git.html[documentation for release 1.6.5.9]
78d553b7
JH
200
201* release notes for
1b974346 202 link:RelNotes/1.6.5.9.txt[1.6.5.9],
761e742d
NP
203 link:RelNotes/1.6.5.8.txt[1.6.5.8],
204 link:RelNotes/1.6.5.7.txt[1.6.5.7],
205 link:RelNotes/1.6.5.6.txt[1.6.5.6],
206 link:RelNotes/1.6.5.5.txt[1.6.5.5],
207 link:RelNotes/1.6.5.4.txt[1.6.5.4],
208 link:RelNotes/1.6.5.3.txt[1.6.5.3],
209 link:RelNotes/1.6.5.2.txt[1.6.5.2],
210 link:RelNotes/1.6.5.1.txt[1.6.5.1],
211 link:RelNotes/1.6.5.txt[1.6.5].
78d553b7 212
1b974346 213* link:v1.6.4.5/git.html[documentation for release 1.6.4.5]
0a53e9dd
JH
214
215* release notes for
1b974346 216 link:RelNotes/1.6.4.5.txt[1.6.4.5],
761e742d
NP
217 link:RelNotes/1.6.4.4.txt[1.6.4.4],
218 link:RelNotes/1.6.4.3.txt[1.6.4.3],
219 link:RelNotes/1.6.4.2.txt[1.6.4.2],
220 link:RelNotes/1.6.4.1.txt[1.6.4.1],
221 link:RelNotes/1.6.4.txt[1.6.4].
0a53e9dd 222
441b40d8 223* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
6096d759
JH
224
225* release notes for
761e742d
NP
226 link:RelNotes/1.6.3.4.txt[1.6.3.4],
227 link:RelNotes/1.6.3.3.txt[1.6.3.3],
228 link:RelNotes/1.6.3.2.txt[1.6.3.2],
229 link:RelNotes/1.6.3.1.txt[1.6.3.1],
230 link:RelNotes/1.6.3.txt[1.6.3].
a95148de
JH
231
232* release notes for
761e742d
NP
233 link:RelNotes/1.6.2.5.txt[1.6.2.5],
234 link:RelNotes/1.6.2.4.txt[1.6.2.4],
235 link:RelNotes/1.6.2.3.txt[1.6.2.3],
236 link:RelNotes/1.6.2.2.txt[1.6.2.2],
237 link:RelNotes/1.6.2.1.txt[1.6.2.1],
238 link:RelNotes/1.6.2.txt[1.6.2].
a95148de 239
621f1b4b 240* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
8104ebfe
JH
241
242* release notes for
761e742d
NP
243 link:RelNotes/1.6.1.3.txt[1.6.1.3],
244 link:RelNotes/1.6.1.2.txt[1.6.1.2],
245 link:RelNotes/1.6.1.1.txt[1.6.1.1],
246 link:RelNotes/1.6.1.txt[1.6.1].
8104ebfe 247
efe05b01 248* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
ea02eef0
JH
249
250* release notes for
761e742d
NP
251 link:RelNotes/1.6.0.6.txt[1.6.0.6],
252 link:RelNotes/1.6.0.5.txt[1.6.0.5],
253 link:RelNotes/1.6.0.4.txt[1.6.0.4],
254 link:RelNotes/1.6.0.3.txt[1.6.0.3],
255 link:RelNotes/1.6.0.2.txt[1.6.0.2],
256 link:RelNotes/1.6.0.1.txt[1.6.0.1],
257 link:RelNotes/1.6.0.txt[1.6.0].
ea02eef0 258
efe05b01 259* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
e449f105
JH
260
261* release notes for
761e742d
NP
262 link:RelNotes/1.5.6.6.txt[1.5.6.6],
263 link:RelNotes/1.5.6.5.txt[1.5.6.5],
264 link:RelNotes/1.5.6.4.txt[1.5.6.4],
265 link:RelNotes/1.5.6.3.txt[1.5.6.3],
266 link:RelNotes/1.5.6.2.txt[1.5.6.2],
267 link:RelNotes/1.5.6.1.txt[1.5.6.1],
268 link:RelNotes/1.5.6.txt[1.5.6].
e449f105 269
efe05b01 270* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
1d2375dd
JH
271
272* release notes for
761e742d
NP
273 link:RelNotes/1.5.5.6.txt[1.5.5.6],
274 link:RelNotes/1.5.5.5.txt[1.5.5.5],
275 link:RelNotes/1.5.5.4.txt[1.5.5.4],
276 link:RelNotes/1.5.5.3.txt[1.5.5.3],
277 link:RelNotes/1.5.5.2.txt[1.5.5.2],
278 link:RelNotes/1.5.5.1.txt[1.5.5.1],
279 link:RelNotes/1.5.5.txt[1.5.5].
1d2375dd 280
efe05b01 281* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
6ce8e44a
JH
282
283* release notes for
761e742d
NP
284 link:RelNotes/1.5.4.7.txt[1.5.4.7],
285 link:RelNotes/1.5.4.6.txt[1.5.4.6],
286 link:RelNotes/1.5.4.5.txt[1.5.4.5],
287 link:RelNotes/1.5.4.4.txt[1.5.4.4],
288 link:RelNotes/1.5.4.3.txt[1.5.4.3],
289 link:RelNotes/1.5.4.2.txt[1.5.4.2],
290 link:RelNotes/1.5.4.1.txt[1.5.4.1],
291 link:RelNotes/1.5.4.txt[1.5.4].
6ce8e44a 292
e708af6e 293* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
5587cac2
JH
294
295* release notes for
761e742d
NP
296 link:RelNotes/1.5.3.8.txt[1.5.3.8],
297 link:RelNotes/1.5.3.7.txt[1.5.3.7],
298 link:RelNotes/1.5.3.6.txt[1.5.3.6],
299 link:RelNotes/1.5.3.5.txt[1.5.3.5],
300 link:RelNotes/1.5.3.4.txt[1.5.3.4],
301 link:RelNotes/1.5.3.3.txt[1.5.3.3],
302 link:RelNotes/1.5.3.2.txt[1.5.3.2],
303 link:RelNotes/1.5.3.1.txt[1.5.3.1],
304 link:RelNotes/1.5.3.txt[1.5.3].
b6e4db6a 305
e636106c
JH
306* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
307
aba170cd 308* release notes for
761e742d
NP
309 link:RelNotes/1.5.2.5.txt[1.5.2.5],
310 link:RelNotes/1.5.2.4.txt[1.5.2.4],
311 link:RelNotes/1.5.2.3.txt[1.5.2.3],
312 link:RelNotes/1.5.2.2.txt[1.5.2.2],
313 link:RelNotes/1.5.2.1.txt[1.5.2.1],
314 link:RelNotes/1.5.2.txt[1.5.2].
aba170cd
JH
315
316* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
317
318* release notes for
761e742d
NP
319 link:RelNotes/1.5.1.6.txt[1.5.1.6],
320 link:RelNotes/1.5.1.5.txt[1.5.1.5],
321 link:RelNotes/1.5.1.4.txt[1.5.1.4],
322 link:RelNotes/1.5.1.3.txt[1.5.1.3],
323 link:RelNotes/1.5.1.2.txt[1.5.1.2],
324 link:RelNotes/1.5.1.1.txt[1.5.1.1],
325 link:RelNotes/1.5.1.txt[1.5.1].
2ff3f61a
JH
326
327* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
328
aba170cd 329* release notes for
761e742d
NP
330 link:RelNotes/1.5.0.7.txt[1.5.0.7],
331 link:RelNotes/1.5.0.6.txt[1.5.0.6],
332 link:RelNotes/1.5.0.5.txt[1.5.0.5],
333 link:RelNotes/1.5.0.3.txt[1.5.0.3],
334 link:RelNotes/1.5.0.2.txt[1.5.0.2],
335 link:RelNotes/1.5.0.1.txt[1.5.0.1],
336 link:RelNotes/1.5.0.txt[1.5.0].
2ff3f61a
JH
337
338* documentation for release link:v1.4.4.4/git.html[1.4.4.4],
339 link:v1.3.3/git.html[1.3.3],
340 link:v1.2.6/git.html[1.2.6],
341 link:v1.0.13/git.html[1.0.13].
26cfcfbf
JH
342
343============
344
345endif::stalenotes[]
346
cb22bc44
AE
347OPTIONS
348-------
349--version::
a87cd02c 350 Prints the git suite version that the 'git' program came from.
cb22bc44
AE
351
352--help::
a87cd02c 353 Prints the synopsis and a list of the most commonly used
0f6f195b
CC
354 commands. If the option '--all' or '-a' is given then all
355 available commands are printed. If a git command is named this
356 option will bring up the manual page for that command.
45533d26
CC
357+
358Other options are available to control how the manual page is
5162e697 359displayed. See linkgit:git-help[1] for more information,
db5d6666
JN
360because `git --help ...` is converted internally into `git
361help ...`.
cb22bc44 362
8b1fa778
AR
363-c <name>=<value>::
364 Pass a configuration parameter to the command. The value
365 given will override values from configuration files.
366 The <name> is expected in the same format as listed by
367 'git config' (subkeys separated by dots).
368
62b4698e 369--exec-path[=<path>]::
a87cd02c 370 Path to wherever your core git programs are installed.
cb22bc44 371 This can also be controlled by setting the GIT_EXEC_PATH
56992f76 372 environment variable. If no path is given, 'git' will print
cb22bc44
AE
373 the current setting and then exit.
374
89a56bfb 375--html-path::
239b5ed9
JN
376 Print the path, without trailing slash, where git's HTML
377 documentation is installed and exit.
89a56bfb 378
f2dd8c37 379--man-path::
239b5ed9
JN
380 Print the manpath (see `man(1)`) for the man pages for
381 this version of git and exit.
f2dd8c37
JS
382
383--info-path::
239b5ed9
JN
384 Print the path where the Info files documenting this
385 version of git are installed and exit.
89a56bfb 386
3240240f
SB
387-p::
388--paginate::
06300d97
JN
389 Pipe all output into 'less' (or if set, $PAGER) if standard
390 output is a terminal. This overrides the `pager.<cmd>`
391 configuration options (see the "Configuration Mechanism" section
392 below).
6acbcb92 393
463a849d
MM
394--no-pager::
395 Do not pipe git output into a pager.
396
6acbcb92
JS
397--git-dir=<path>::
398 Set the path to the repository. This can also be controlled by
302cc11a
LY
399 setting the GIT_DIR environment variable. It can be an absolute
400 path or relative path to current working directory.
6acbcb92 401
892c41b9 402--work-tree=<path>::
ea472c1e
JH
403 Set the path to the working tree. It can be an absolute path
404 or a path relative to the current working directory.
892c41b9
ML
405 This can also be controlled by setting the GIT_WORK_TREE
406 environment variable and the core.worktree configuration
ea472c1e
JH
407 variable (see core.worktree in linkgit:git-config[1] for a
408 more detailed discussion).
892c41b9 409
d49483f0
JT
410--namespace=<path>::
411 Set the git namespace. See linkgit:gitnamespaces[7] for more
412 details. Equivalent to setting the `GIT_NAMESPACE` environment
413 variable.
414
6acbcb92 415--bare::
9277d602
JH
416 Treat the repository as a bare repository. If GIT_DIR
417 environment is not set, it is set to the current working
418 directory.
419
b0fa7ab5
CC
420--no-replace-objects::
421 Do not use replacement refs to replace git objects. See
422 linkgit:git-replace[1] for more information.
423
9755afbd 424
23091e95
BF
425GIT COMMANDS
426------------
9755afbd 427
23091e95
BF
428We divide git into high level ("porcelain") commands and low level
429("plumbing") commands.
8b15e2fb 430
23091e95
BF
431High-level commands (porcelain)
432-------------------------------
433
434We separate the porcelain commands into the main commands and some
435ancillary user utilities.
436
437Main porcelain commands
438~~~~~~~~~~~~~~~~~~~~~~~
905197de 439
377e8139 440include::cmds-mainporcelain.txt[]
e31bb3bb 441
90933efb 442Ancillary Commands
23091e95 443~~~~~~~~~~~~~~~~~~
2f2de9b4
JH
444Manipulators:
445
377e8139 446include::cmds-ancillarymanipulators.txt[]
204ee6a9 447
90933efb 448Interrogators:
204ee6a9 449
377e8139 450include::cmds-ancillaryinterrogators.txt[]
7fc9d69f 451
89bf2077
JH
452
453Interacting with Others
454~~~~~~~~~~~~~~~~~~~~~~~
455
456These commands are to interact with foreign SCM and with other
457people via patch over e-mail.
458
459include::cmds-foreignscminterface.txt[]
460
461
b1f33d62
RR
462Low-level commands (plumbing)
463-----------------------------
464
465Although git includes its
466own porcelain layer, its low-level commands are sufficient to support
467development of alternative porcelains. Developers of such porcelains
5162e697
DM
468might start by reading about linkgit:git-update-index[1] and
469linkgit:git-read-tree[1].
b1f33d62 470
89bf2077
JH
471The interface (input, output, set of options and the semantics)
472to these low-level commands are meant to be a lot more stable
473than Porcelain level commands, because these commands are
474primarily for scripted use. The interface to Porcelain commands
475on the other hand are subject to change in order to improve the
476end user experience.
477
478The following description divides
479the low-level commands into commands that manipulate objects (in
b1f33d62
RR
480the repository, index, and working tree), commands that interrogate and
481compare objects, and commands that move objects and references between
482repositories.
483
89bf2077 484
b1f33d62
RR
485Manipulation commands
486~~~~~~~~~~~~~~~~~~~~~
b1f33d62 487
377e8139 488include::cmds-plumbingmanipulators.txt[]
b1f33d62
RR
489
490
491Interrogation commands
492~~~~~~~~~~~~~~~~~~~~~~
493
377e8139 494include::cmds-plumbinginterrogators.txt[]
b1f33d62
RR
495
496In general, the interrogate commands do not touch the files in
497the working tree.
498
499
500Synching repositories
501~~~~~~~~~~~~~~~~~~~~~
502
377e8139 503include::cmds-synchingrepositories.txt[]
b1f33d62 504
57f6ec02 505The following are helper commands used by the above; end users
89bf2077
JH
506typically do not use them directly.
507
508include::cmds-synchelpers.txt[]
509
510
511Internal helper commands
512~~~~~~~~~~~~~~~~~~~~~~~~
513
514These are internal helper commands used by other commands; end
515users typically do not use them directly.
516
517include::cmds-purehelpers.txt[]
518
b1f33d62 519
5773c9f2
JH
520Configuration Mechanism
521-----------------------
522
2fa090b6 523Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
5773c9f2 524is used to hold per-repository configuration options. It is a
addf88e4 525simple text file modeled after `.ini` format familiar to some
5773c9f2
JH
526people. Here is an example:
527
528------------
529#
2fa090b6 530# A '#' or ';' character indicates a comment.
5773c9f2
JH
531#
532
533; core variables
534[core]
535 ; Don't trust file modes
536 filemode = false
537
538; user identity
539[user]
540 name = "Junio C Hamano"
541 email = "junkio@twinsun.com"
542
543------------
544
545Various commands read from the configuration file and adjust
06300d97
JN
546their operation accordingly. See linkgit:git-config[1] for a
547list.
5773c9f2
JH
548
549
6c84e2e0 550Identifier Terminology
2cf565c5
DG
551----------------------
552<object>::
2fa090b6 553 Indicates the object name for any type of object.
2cf565c5
DG
554
555<blob>::
2fa090b6 556 Indicates a blob object name.
2cf565c5
DG
557
558<tree>::
2fa090b6 559 Indicates a tree object name.
2cf565c5
DG
560
561<commit>::
2fa090b6 562 Indicates a commit object name.
2cf565c5
DG
563
564<tree-ish>::
2fa090b6 565 Indicates a tree, commit or tag object name. A
6c84e2e0
DG
566 command that takes a <tree-ish> argument ultimately wants to
567 operate on a <tree> object but automatically dereferences
568 <commit> and <tag> objects that point at a <tree>.
2cf565c5 569
043d7605
TT
570<commit-ish>::
571 Indicates a commit or tag object name. A
572 command that takes a <commit-ish> argument ultimately wants to
573 operate on a <commit> object but automatically dereferences
574 <tag> objects that point at a <commit>.
575
2cf565c5
DG
576<type>::
577 Indicates that an object type is required.
2fa090b6 578 Currently one of: `blob`, `tree`, `commit`, or `tag`.
2cf565c5
DG
579
580<file>::
2fa090b6
JH
581 Indicates a filename - almost always relative to the
582 root of the tree structure `GIT_INDEX_FILE` describes.
2cf565c5 583
c1bdacf9
DG
584Symbolic Identifiers
585--------------------
90933efb 586Any git command accepting any <object> can also use the following
6c84e2e0 587symbolic notation:
c1bdacf9
DG
588
589HEAD::
0abcfbff 590 indicates the head of the current branch.
2fa090b6 591
c1bdacf9 592<tag>::
2fa090b6 593 a valid tag 'name'
0abcfbff 594 (i.e. a `refs/tags/<tag>` reference).
2fa090b6 595
c1bdacf9 596<head>::
2fa090b6 597 a valid head 'name'
0abcfbff 598 (i.e. a `refs/heads/<head>` reference).
2fa090b6 599
d47107d8 600For a more complete list of ways to spell object names, see
9d83e382 601"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
d47107d8 602
c1bdacf9
DG
603
604File/Directory Structure
605------------------------
c1bdacf9 606
6998e4db 607Please see the linkgit:gitrepository-layout[5] document.
c1bdacf9 608
6998e4db 609Read linkgit:githooks[5] for more details about each hook.
6250ad1e 610
c1bdacf9 611Higher level SCMs may provide and manage additional information in the
2fa090b6 612`$GIT_DIR`.
c1bdacf9 613
a1d4aa74 614
2cf565c5
DG
615Terminology
616-----------
6998e4db 617Please see linkgit:gitglossary[7].
2cf565c5
DG
618
619
620Environment Variables
621---------------------
622Various git commands use the following environment variables:
623
c1bdacf9
DG
624The git Repository
625~~~~~~~~~~~~~~~~~~
626These environment variables apply to 'all' core git commands. Nb: it
627is worth noting that they may be used/overridden by SCMS sitting above
2fa090b6 628git so take care if using Cogito etc.
c1bdacf9
DG
629
630'GIT_INDEX_FILE'::
631 This environment allows the specification of an alternate
5f3aa197
LS
632 index file. If not specified, the default of `$GIT_DIR/index`
633 is used.
c1bdacf9
DG
634
635'GIT_OBJECT_DIRECTORY'::
636 If the object storage directory is specified via this
637 environment variable then the sha1 directories are created
638 underneath - otherwise the default `$GIT_DIR/objects`
639 directory is used.
640
641'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
642 Due to the immutable nature of git objects, old objects can be
643 archived into shared, read-only directories. This variable
80ba074f
JS
644 specifies a ":" separated (on Windows ";" separated) list
645 of git object directories which can be used to search for git
646 objects. New objects will not be written to these directories.
c1bdacf9
DG
647
648'GIT_DIR'::
2fa090b6
JH
649 If the 'GIT_DIR' environment variable is set then it
650 specifies a path to use instead of the default `.git`
651 for the base of the repository.
c1bdacf9 652
892c41b9
ML
653'GIT_WORK_TREE'::
654 Set the path to the working tree. The value will not be
655 used in combination with repositories found automatically in
656 a .git directory (i.e. $GIT_DIR is not set).
657 This can also be controlled by the '--work-tree' command line
658 option and the core.worktree configuration variable.
659
d49483f0
JT
660'GIT_NAMESPACE'::
661 Set the git namespace; see linkgit:gitnamespaces[7] for details.
662 The '--namespace' command-line option also sets this value.
663
0454dd93
DR
664'GIT_CEILING_DIRECTORIES'::
665 This should be a colon-separated list of absolute paths.
666 If set, it is a list of directories that git should not chdir
667 up into while looking for a repository directory.
668 It will not exclude the current working directory or
669 a GIT_DIR set on the command line or in the environment.
670 (Useful for excluding slow-loading network directories.)
671
cf87463e 672'GIT_DISCOVERY_ACROSS_FILESYSTEM'::
e6405517
JH
673 When run in a directory that does not have ".git" repository
674 directory, git tries to find such a directory in the parent
675 directories to find the top of the working tree, but by default it
676 does not cross filesystem boundaries. This environment variable
cf87463e
JH
677 can be set to true to tell git not to stop at filesystem
678 boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect
679 an explicit repository directory set via 'GIT_DIR' or on the
680 command line.
8030e442 681
c1bdacf9
DG
682git Commits
683~~~~~~~~~~~
684'GIT_AUTHOR_NAME'::
685'GIT_AUTHOR_EMAIL'::
686'GIT_AUTHOR_DATE'::
687'GIT_COMMITTER_NAME'::
688'GIT_COMMITTER_EMAIL'::
4e58bf97 689'GIT_COMMITTER_DATE'::
28a94f88 690'EMAIL'::
5162e697 691 see linkgit:git-commit-tree[1]
c1bdacf9
DG
692
693git Diffs
694~~~~~~~~~
d81ed1b5 695'GIT_DIFF_OPTS'::
fde97d8a
SE
696 Only valid setting is "--unified=??" or "-u??" to set the
697 number of context lines shown when a unified diff is created.
698 This takes precedence over any "-U" or "--unified" option
699 value passed on the git diff command line.
700
d81ed1b5 701'GIT_EXTERNAL_DIFF'::
fde97d8a
SE
702 When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
703 program named by it is called, instead of the diff invocation
704 described above. For a path that is added, removed, or modified,
705 'GIT_EXTERNAL_DIFF' is called with 7 parameters:
706
707 path old-file old-hex old-mode new-file new-hex new-mode
708+
709where:
710
711 <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
712 contents of <old|new>,
713 <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
714 <old|new>-mode:: are the octal representation of the file modes.
fde97d8a
SE
715+
716The file parameters can point at the user's working file
717(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
718when a new file is added), or a temporary file (e.g. `old-file` in the
719index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the
720temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.
721+
722For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1
723parameter, <path>.
2cf565c5 724
575ba9d6
ML
725other
726~~~~~
dbddb714
JN
727'GIT_MERGE_VERBOSITY'::
728 A number controlling the amount of output shown by
729 the recursive merge strategy. Overrides merge.verbosity.
5162e697 730 See linkgit:git-merge[1]
dbddb714 731
c27d205a 732'GIT_PAGER'::
a7738c77
SG
733 This environment variable overrides `$PAGER`. If it is set
734 to an empty string or to the value "cat", git will not launch
ab54cd6c
JN
735 a pager. See also the `core.pager` option in
736 linkgit:git-config[1].
c27d205a 737
36384c97
RSM
738'GIT_EDITOR'::
739 This environment variable overrides `$EDITOR` and `$VISUAL`.
b4ab1980 740 It is used by several git commands when, on interactive mode,
36384c97
RSM
741 an editor is to be launched. See also linkgit:git-var[1]
742 and the `core.editor` option in linkgit:git-config[1].
743
d5538b41 744'GIT_SSH'::
0b444cdb
TR
745 If this environment variable is set then 'git fetch'
746 and 'git push' will use this command instead
2fd02c92 747 of 'ssh' when they need to connect to a remote system.
483bc4f0 748 The '$GIT_SSH' command will be given exactly two arguments:
d5538b41
SP
749 the 'username@host' (or just 'host') from the URL and the
750 shell command to execute on that remote system.
751+
752To pass options to the program that you want to list in GIT_SSH
753you will need to wrap the program and options into a shell script,
754then set GIT_SSH to refer to the shell script.
755+
756Usually it is easier to configure any desired options through your
757personal `.ssh/config` file. Please consult your ssh documentation
758for further details.
759
453842c9
KF
760'GIT_ASKPASS'::
761 If this environment variable is set, then git commands which need to
762 acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
763 will call this program with a suitable prompt as command line argument
764 and read the password from its STDOUT. See also the 'core.askpass'
765 option in linkgit:git-config[1].
766
06f59e9f
TT
767'GIT_FLUSH'::
768 If this environment variable is set to "1", then commands such
0b444cdb
TR
769 as 'git blame' (in incremental mode), 'git rev-list', 'git log',
770 and 'git whatchanged' will force a flush of the output stream
06f59e9f
TT
771 after each commit-oriented record have been flushed. If this
772 variable is set to "0", the output of these commands will be done
773 using completely buffered I/O. If this environment variable is
774 not set, git will choose buffered or record-oriented flushing
775 based on whether stdout appears to be redirected to a file or not.
776
575ba9d6 777'GIT_TRACE'::
2886bdb1
CC
778 If this variable is set to "1", "2" or "true" (comparison
779 is case insensitive), git will print `trace:` messages on
575ba9d6
ML
780 stderr telling about alias expansion, built-in command
781 execution and external command execution.
2886bdb1
CC
782 If this variable is set to an integer value greater than 1
783 and lower than 10 (strictly) then git will interpret this
784 value as an open file descriptor and will try to write the
785 trace messages into this file descriptor.
786 Alternatively, if this variable is set to an absolute path
787 (starting with a '/' character), git will interpret this
788 as a file path and will try to write the trace messages
789 into it.
575ba9d6 790
8db9307c
JH
791Discussion[[Discussion]]
792------------------------
40dac517
BF
793
794More detail on the following is available from the
795link:user-manual.html#git-concepts[git concepts chapter of the
6998e4db 796user-manual] and linkgit:gitcore-tutorial[7].
40dac517
BF
797
798A git project normally consists of a working directory with a ".git"
799subdirectory at the top level. The .git directory contains, among other
800things, a compressed object database representing the complete history
801of the project, an "index" file which links that history to the current
802contents of the working tree, and named pointers into that history such
803as tags and branch heads.
804
805The object database contains objects of three main types: blobs, which
806hold file data; trees, which point to blobs and other trees to build up
02ff6250 807directory hierarchies; and commits, which each reference a single tree
40dac517
BF
808and some number of parent commits.
809
810The commit, equivalent to what other systems call a "changeset" or
811"version", represents a step in the project's history, and each parent
812represents an immediately preceding step. Commits with more than one
813parent represent merges of independent lines of development.
814
815All objects are named by the SHA1 hash of their contents, normally
816written as a string of 40 hex digits. Such names are globally unique.
817The entire history leading up to a commit can be vouched for by signing
818just that commit. A fourth object type, the tag, is provided for this
819purpose.
820
821When first created, objects are stored in individual files, but for
822efficiency may later be compressed together into "pack files".
823
824Named pointers called refs mark interesting points in history. A ref
825may contain the SHA1 name of an object or the name of another ref. Refs
826with names beginning `ref/head/` contain the SHA1 name of the most
02ff6250 827recent commit (or "head") of a branch under development. SHA1 names of
40dac517
BF
828tags of interest are stored under `ref/tags/`. A special ref named
829`HEAD` contains the name of the currently checked-out branch.
830
831The index file is initialized with a list of all paths and, for each
832path, a blob object and a set of attributes. The blob object represents
833the contents of the file as of the head of the current branch. The
834attributes (last modified time, size, etc.) are taken from the
835corresponding file in the working tree. Subsequent changes to the
836working tree can be found by comparing these attributes. The index may
837be updated with new content, and new commits may be created from the
838content stored in the index.
839
840The index is also capable of storing multiple entries (called "stages")
841for a given pathname. These stages are used to hold the various
842unmerged version of a file when a merge is in progress.
6c84e2e0 843
7687ae98
JH
844FURTHER DOCUMENTATION
845---------------------
846
847See the references in the "description" section to get started
848using git. The following is probably more detail than necessary
849for a first-time user.
850
851The link:user-manual.html#git-concepts[git concepts chapter of the
852user-manual] and linkgit:gitcore-tutorial[7] both provide
853introductions to the underlying git architecture.
854
855See linkgit:gitworkflows[7] for an overview of recommended workflows.
856
857See also the link:howto-index.html[howto] documents for some useful
858examples.
859
860The internals are documented in the
861link:technical/api-index.html[GIT API documentation].
862
863Users migrating from CVS may also want to
864read linkgit:gitcvs-migration[7].
865
866
cb22bc44
AE
867Authors
868-------
48bb914e
JK
869Git was started by Linus Torvalds, and is currently maintained by Junio
870C Hamano. Numerous contributions have come from the git mailing list
ac046c0e 871<git@vger.kernel.org>. If you have a clone of git.git itself, the
d8f708f8
JK
872output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
873the authors for specific parts of the project.
2cf565c5 874
c97ca277
JH
875Reporting Bugs
876--------------
877
878Report bugs to the Git mailing list <git@vger.kernel.org> where the
879development and maintenance is primarily done. You do not have to be
880subscribed to the list to send a message there.
881
497c8331
CC
882SEE ALSO
883--------
884linkgit:gittutorial[7], linkgit:gittutorial-2[7],
5cbef01a 885link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
497c8331 886linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
801a011d
TR
887linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
888linkgit:gitworkflows[7]
497c8331 889
2cf565c5
DG
890GIT
891---
9e1f0a85 892Part of the linkgit:git[1] suite