2008-06-06 09:07:32 +02:00
|
|
|
git(1)
|
2005-05-10 23:32:30 +02:00
|
|
|
======
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
|
|
|
git - the stupid content tracker
|
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2006-08-25 03:05:48 +02:00
|
|
|
[verse]
|
2013-09-09 15:47:43 +02:00
|
|
|
'git' [--version] [--help] [-C <path>] [-c <name>=<value>]
|
2012-02-15 00:54:21 +01:00
|
|
|
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
|
2011-07-09 01:14:10 +02:00
|
|
|
[-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
|
|
|
|
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
|
2012-02-15 00:54:21 +01:00
|
|
|
<command> [<args>]
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2006-04-02 23:54:34 +02:00
|
|
|
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.
|
|
|
|
|
2008-07-01 00:01:21 +02:00
|
|
|
See linkgit:gittutorial[7] to get started, then see
|
2012-08-17 21:48:52 +02:00
|
|
|
link:everyday.html[Everyday Git] for a useful minimum set of
|
|
|
|
commands. The link:user-manual.html[Git User's Manual] has a more
|
|
|
|
in-depth introduction.
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2012-08-17 21:48:52 +02:00
|
|
|
After you mastered the basic concepts, you can come back to this
|
2013-01-21 20:17:53 +01:00
|
|
|
page to learn what commands Git offers. You can learn more about
|
|
|
|
individual Git commands with "git help command". linkgit:gitcli[7]
|
2012-08-17 21:48:52 +02:00
|
|
|
manual page gives you an overview of the command line command syntax.
|
2006-06-07 20:43:50 +02:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
Formatted and hyperlinked version of the latest Git documentation
|
2012-08-17 21:48:52 +02:00
|
|
|
can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
|
2007-04-30 13:21:38 +02:00
|
|
|
|
2007-02-14 00:15:05 +01:00
|
|
|
ifdef::stalenotes[]
|
|
|
|
[NOTE]
|
|
|
|
============
|
|
|
|
|
2007-05-19 06:43:13 +02:00
|
|
|
You are reading the documentation for the latest (possibly
|
2013-01-21 20:17:53 +01:00
|
|
|
unreleased) version of Git, that is available from 'master'
|
2007-05-19 06:43:13 +02:00
|
|
|
branch of the `git.git` repository.
|
|
|
|
Documentation for older releases are available here:
|
2007-03-29 00:40:17 +02:00
|
|
|
|
2013-12-03 20:16:56 +01:00
|
|
|
* link:v1.8.5.1/git.html[documentation for release 1.8.5.1]
|
2013-11-27 21:14:45 +01:00
|
|
|
|
|
|
|
* release notes for
|
2013-12-03 20:16:56 +01:00
|
|
|
link:RelNotes/1.8.5.1.txt[1.8.5.1],
|
2013-11-27 21:14:45 +01:00
|
|
|
link:RelNotes/1.8.5.txt[1.8.5].
|
|
|
|
|
2013-12-03 00:33:30 +01:00
|
|
|
* link:v1.8.4.5/git.html[documentation for release 1.8.4.5]
|
2013-08-23 20:49:46 +02:00
|
|
|
|
|
|
|
* release notes for
|
2013-12-03 00:33:30 +01:00
|
|
|
link:RelNotes/1.8.4.5.txt[1.8.4.5],
|
2013-11-20 20:26:08 +01:00
|
|
|
link:RelNotes/1.8.4.4.txt[1.8.4.4],
|
2013-11-08 21:06:19 +01:00
|
|
|
link:RelNotes/1.8.4.3.txt[1.8.4.3],
|
2013-10-28 18:21:29 +01:00
|
|
|
link:RelNotes/1.8.4.2.txt[1.8.4.2],
|
2013-09-27 00:01:41 +02:00
|
|
|
link:RelNotes/1.8.4.1.txt[1.8.4.1],
|
2013-08-23 20:49:46 +02:00
|
|
|
link:RelNotes/1.8.4.txt[1.8.4].
|
|
|
|
|
2013-07-22 20:21:34 +02:00
|
|
|
* link:v1.8.3.4/git.html[documentation for release 1.8.3.4]
|
2013-05-30 00:19:12 +02:00
|
|
|
|
|
|
|
* release notes for
|
2013-07-22 20:21:34 +02:00
|
|
|
link:RelNotes/1.8.3.4.txt[1.8.3.4],
|
2013-07-15 19:39:43 +02:00
|
|
|
link:RelNotes/1.8.3.3.txt[1.8.3.3],
|
2013-06-28 23:56:30 +02:00
|
|
|
link:RelNotes/1.8.3.2.txt[1.8.3.2],
|
2013-06-10 02:16:20 +02:00
|
|
|
link:RelNotes/1.8.3.1.txt[1.8.3.1],
|
2013-05-30 00:19:12 +02:00
|
|
|
link:RelNotes/1.8.3.txt[1.8.3].
|
|
|
|
|
2013-05-09 21:37:53 +02:00
|
|
|
* link:v1.8.2.3/git.html[documentation for release 1.8.2.3]
|
2013-03-13 19:28:08 +01:00
|
|
|
|
|
|
|
* release notes for
|
2013-05-30 00:19:12 +02:00
|
|
|
link:RelNotes/1.8.2.3.txt[1.8.2.3],
|
|
|
|
link:RelNotes/1.8.2.2.txt[1.8.2.2],
|
|
|
|
link:RelNotes/1.8.2.1.txt[1.8.2.1],
|
2013-03-13 19:28:08 +01:00
|
|
|
link:RelNotes/1.8.2.txt[1.8.2].
|
|
|
|
|
2013-04-07 17:58:30 +02:00
|
|
|
* link:v1.8.1.6/git.html[documentation for release 1.8.1.6]
|
2012-12-31 23:24:22 +01:00
|
|
|
|
|
|
|
* release notes for
|
2013-04-07 17:58:30 +02:00
|
|
|
link:RelNotes/1.8.1.6.txt[1.8.1.6],
|
2013-03-01 22:15:29 +01:00
|
|
|
link:RelNotes/1.8.1.5.txt[1.8.1.5],
|
2013-02-19 06:48:05 +01:00
|
|
|
link:RelNotes/1.8.1.4.txt[1.8.1.4],
|
2013-02-08 00:21:10 +01:00
|
|
|
link:RelNotes/1.8.1.3.txt[1.8.1.3],
|
|
|
|
link:RelNotes/1.8.1.2.txt[1.8.1.2],
|
2013-01-14 17:04:50 +01:00
|
|
|
link:RelNotes/1.8.1.1.txt[1.8.1.1],
|
2012-12-31 23:24:22 +01:00
|
|
|
link:RelNotes/1.8.1.txt[1.8.1].
|
|
|
|
|
2012-12-28 00:57:20 +01:00
|
|
|
* link:v1.8.0.3/git.html[documentation for release 1.8.0.3]
|
2012-10-21 22:56:23 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-12-28 00:57:20 +01:00
|
|
|
link:RelNotes/1.8.0.3.txt[1.8.0.3],
|
2012-12-10 22:05:47 +01:00
|
|
|
link:RelNotes/1.8.0.2.txt[1.8.0.2],
|
2012-11-26 03:40:34 +01:00
|
|
|
link:RelNotes/1.8.0.1.txt[1.8.0.1],
|
|
|
|
link:RelNotes/1.8.0.txt[1.8.0].
|
2012-10-21 22:56:23 +02:00
|
|
|
|
2012-10-17 19:36:01 +02:00
|
|
|
* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
|
2012-08-20 02:02:11 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-10-17 19:36:01 +02:00
|
|
|
link:RelNotes/1.7.12.4.txt[1.7.12.4],
|
2012-10-08 20:40:43 +02:00
|
|
|
link:RelNotes/1.7.12.3.txt[1.7.12.3],
|
2012-09-30 07:33:25 +02:00
|
|
|
link:RelNotes/1.7.12.2.txt[1.7.12.2],
|
2012-09-18 23:34:31 +02:00
|
|
|
link:RelNotes/1.7.12.1.txt[1.7.12.1],
|
2012-08-20 02:02:11 +02:00
|
|
|
link:RelNotes/1.7.12.txt[1.7.12].
|
|
|
|
|
2012-09-15 05:57:23 +02:00
|
|
|
* link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
|
2012-06-17 23:07:15 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-09-15 05:57:23 +02:00
|
|
|
link:RelNotes/1.7.11.7.txt[1.7.11.7],
|
2012-09-11 20:18:48 +02:00
|
|
|
link:RelNotes/1.7.11.6.txt[1.7.11.6],
|
2012-08-15 22:39:53 +02:00
|
|
|
link:RelNotes/1.7.11.5.txt[1.7.11.5],
|
2012-07-30 22:09:25 +02:00
|
|
|
link:RelNotes/1.7.11.4.txt[1.7.11.4],
|
2012-07-22 22:07:40 +02:00
|
|
|
link:RelNotes/1.7.11.3.txt[1.7.11.3],
|
2012-07-11 21:55:38 +02:00
|
|
|
link:RelNotes/1.7.11.2.txt[1.7.11.2],
|
2012-06-21 22:16:46 +02:00
|
|
|
link:RelNotes/1.7.11.1.txt[1.7.11.1],
|
2012-06-17 23:07:15 +02:00
|
|
|
link:RelNotes/1.7.11.txt[1.7.11].
|
|
|
|
|
2012-06-17 23:04:15 +02:00
|
|
|
* link:v1.7.10.5/git.html[documentation for release 1.7.10.5]
|
2012-04-06 19:47:58 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-06-17 23:04:15 +02:00
|
|
|
link:RelNotes/1.7.10.5.txt[1.7.10.5],
|
2012-06-04 00:53:58 +02:00
|
|
|
link:RelNotes/1.7.10.4.txt[1.7.10.4],
|
2012-06-01 22:05:27 +02:00
|
|
|
link:RelNotes/1.7.10.3.txt[1.7.10.3],
|
2012-05-11 20:25:28 +02:00
|
|
|
link:RelNotes/1.7.10.2.txt[1.7.10.2],
|
2012-05-02 06:18:44 +02:00
|
|
|
link:RelNotes/1.7.10.1.txt[1.7.10.1],
|
2012-04-06 19:47:58 +02:00
|
|
|
link:RelNotes/1.7.10.txt[1.7.10].
|
|
|
|
|
2012-04-26 19:23:15 +02:00
|
|
|
* link:v1.7.9.7/git.html[documentation for release 1.7.9.7]
|
2012-01-27 20:31:02 +01:00
|
|
|
|
|
|
|
* release notes for
|
2012-04-26 19:23:15 +02:00
|
|
|
link:RelNotes/1.7.9.7.txt[1.7.9.7],
|
2012-04-02 22:07:58 +02:00
|
|
|
link:RelNotes/1.7.9.6.txt[1.7.9.6],
|
2012-03-26 21:23:34 +02:00
|
|
|
link:RelNotes/1.7.9.5.txt[1.7.9.5],
|
2012-03-12 23:52:52 +01:00
|
|
|
link:RelNotes/1.7.9.4.txt[1.7.9.4],
|
2012-03-05 23:29:07 +01:00
|
|
|
link:RelNotes/1.7.9.3.txt[1.7.9.3],
|
2012-02-23 02:48:01 +01:00
|
|
|
link:RelNotes/1.7.9.2.txt[1.7.9.2],
|
2012-02-14 18:53:38 +01:00
|
|
|
link:RelNotes/1.7.9.1.txt[1.7.9.1],
|
2012-01-27 20:31:02 +01:00
|
|
|
link:RelNotes/1.7.9.txt[1.7.9].
|
|
|
|
|
2012-04-26 18:59:22 +02:00
|
|
|
* link:v1.7.8.6/git.html[documentation for release 1.7.8.6]
|
2011-12-02 18:31:32 +01:00
|
|
|
|
|
|
|
* release notes for
|
2012-04-26 18:59:22 +02:00
|
|
|
link:RelNotes/1.7.8.6.txt[1.7.8.6],
|
2012-04-02 22:07:58 +02:00
|
|
|
link:RelNotes/1.7.8.5.txt[1.7.8.5],
|
2012-01-19 00:51:00 +01:00
|
|
|
link:RelNotes/1.7.8.4.txt[1.7.8.4],
|
2012-01-06 21:41:39 +01:00
|
|
|
link:RelNotes/1.7.8.3.txt[1.7.8.3],
|
|
|
|
link:RelNotes/1.7.8.2.txt[1.7.8.2],
|
|
|
|
link:RelNotes/1.7.8.1.txt[1.7.8.1],
|
2011-12-02 18:31:32 +01:00
|
|
|
link:RelNotes/1.7.8.txt[1.7.8].
|
|
|
|
|
2012-04-26 18:41:52 +02:00
|
|
|
* link:v1.7.7.7/git.html[documentation for release 1.7.7.7]
|
2011-09-30 23:20:57 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-04-26 18:41:52 +02:00
|
|
|
link:RelNotes/1.7.7.7.txt[1.7.7.7],
|
2012-01-19 00:51:00 +01:00
|
|
|
link:RelNotes/1.7.7.6.txt[1.7.7.6],
|
2011-12-14 06:55:31 +01:00
|
|
|
link:RelNotes/1.7.7.5.txt[1.7.7.5],
|
|
|
|
link:RelNotes/1.7.7.4.txt[1.7.7.4],
|
|
|
|
link:RelNotes/1.7.7.3.txt[1.7.7.3],
|
|
|
|
link:RelNotes/1.7.7.2.txt[1.7.7.2],
|
2011-10-24 06:48:06 +02:00
|
|
|
link:RelNotes/1.7.7.1.txt[1.7.7.1],
|
2011-09-30 23:20:57 +02:00
|
|
|
link:RelNotes/1.7.7.txt[1.7.7].
|
|
|
|
|
2012-02-06 08:46:44 +01:00
|
|
|
* link:v1.7.6.6/git.html[documentation for release 1.7.6.6]
|
2011-06-26 21:41:16 +02:00
|
|
|
|
|
|
|
* release notes for
|
2012-02-06 08:46:44 +01:00
|
|
|
link:RelNotes/1.7.6.6.txt[1.7.6.6],
|
2011-12-14 06:30:40 +01:00
|
|
|
link:RelNotes/1.7.6.5.txt[1.7.6.5],
|
2011-09-23 23:38:39 +02:00
|
|
|
link:RelNotes/1.7.6.4.txt[1.7.6.4],
|
2011-09-12 19:33:03 +02:00
|
|
|
link:RelNotes/1.7.6.3.txt[1.7.6.3],
|
2011-09-06 20:41:02 +02:00
|
|
|
link:RelNotes/1.7.6.2.txt[1.7.6.2],
|
|
|
|
link:RelNotes/1.7.6.1.txt[1.7.6.1],
|
2011-06-26 21:41:16 +02:00
|
|
|
link:RelNotes/1.7.6.txt[1.7.6].
|
|
|
|
|
2011-06-01 23:08:26 +02:00
|
|
|
* link:v1.7.5.4/git.html[documentation for release 1.7.5.4]
|
2011-04-24 08:36:32 +02:00
|
|
|
|
|
|
|
* release notes for
|
2011-06-01 23:08:26 +02:00
|
|
|
link:RelNotes/1.7.5.4.txt[1.7.5.4],
|
2011-05-26 18:45:29 +02:00
|
|
|
link:RelNotes/1.7.5.3.txt[1.7.5.3],
|
2011-05-20 05:30:44 +02:00
|
|
|
link:RelNotes/1.7.5.2.txt[1.7.5.2],
|
2011-05-05 00:47:40 +02:00
|
|
|
link:RelNotes/1.7.5.1.txt[1.7.5.1],
|
2011-04-24 08:36:32 +02:00
|
|
|
link:RelNotes/1.7.5.txt[1.7.5].
|
|
|
|
|
2011-04-19 20:51:00 +02:00
|
|
|
* link:v1.7.4.5/git.html[documentation for release 1.7.4.5]
|
2011-01-30 20:53:13 +01:00
|
|
|
|
|
|
|
* release notes for
|
2011-04-19 20:51:00 +02:00
|
|
|
link:RelNotes/1.7.4.5.txt[1.7.4.5],
|
2011-04-06 19:57:32 +02:00
|
|
|
link:RelNotes/1.7.4.4.txt[1.7.4.4],
|
2011-04-03 09:18:50 +02:00
|
|
|
link:RelNotes/1.7.4.3.txt[1.7.4.3],
|
|
|
|
link:RelNotes/1.7.4.2.txt[1.7.4.2],
|
2011-02-11 23:39:55 +01:00
|
|
|
link:RelNotes/1.7.4.1.txt[1.7.4.1],
|
2011-01-30 20:53:13 +01:00
|
|
|
link:RelNotes/1.7.4.txt[1.7.4].
|
|
|
|
|
2011-01-05 23:46:07 +01:00
|
|
|
* link:v1.7.3.5/git.html[documentation for release 1.7.3.5]
|
2010-09-18 23:55:08 +02:00
|
|
|
|
|
|
|
* release notes for
|
2011-01-05 23:46:07 +01:00
|
|
|
link:RelNotes/1.7.3.5.txt[1.7.3.5],
|
2010-12-16 00:30:49 +01:00
|
|
|
link:RelNotes/1.7.3.4.txt[1.7.3.4],
|
2010-12-10 00:52:12 +01:00
|
|
|
link:RelNotes/1.7.3.3.txt[1.7.3.3],
|
2010-10-22 02:14:32 +02:00
|
|
|
link:RelNotes/1.7.3.2.txt[1.7.3.2],
|
2010-09-29 18:42:53 +02:00
|
|
|
link:RelNotes/1.7.3.1.txt[1.7.3.1],
|
2010-09-18 23:55:08 +02:00
|
|
|
link:RelNotes/1.7.3.txt[1.7.3].
|
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.7.2.5/git.html[documentation for release 1.7.2.5]
|
2010-07-21 21:55:50 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.7.2.5.txt[1.7.2.5],
|
2010-12-10 00:52:12 +01:00
|
|
|
link:RelNotes/1.7.2.4.txt[1.7.2.4],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.7.2.3.txt[1.7.2.3],
|
|
|
|
link:RelNotes/1.7.2.2.txt[1.7.2.2],
|
|
|
|
link:RelNotes/1.7.2.1.txt[1.7.2.1],
|
|
|
|
link:RelNotes/1.7.2.txt[1.7.2].
|
2010-07-21 21:55:50 +02:00
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.7.1.4/git.html[documentation for release 1.7.1.4]
|
2010-04-24 03:27:17 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.7.1.4.txt[1.7.1.4],
|
2010-12-10 00:52:12 +01:00
|
|
|
link:RelNotes/1.7.1.3.txt[1.7.1.3],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.7.1.2.txt[1.7.1.2],
|
|
|
|
link:RelNotes/1.7.1.1.txt[1.7.1.1],
|
|
|
|
link:RelNotes/1.7.1.txt[1.7.1].
|
2010-04-24 03:27:17 +02:00
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.7.0.9/git.html[documentation for release 1.7.0.9]
|
2010-02-13 00:45:05 +01:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.7.0.9.txt[1.7.0.9],
|
2010-12-10 00:52:12 +01:00
|
|
|
link:RelNotes/1.7.0.8.txt[1.7.0.8],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.7.0.7.txt[1.7.0.7],
|
|
|
|
link:RelNotes/1.7.0.6.txt[1.7.0.6],
|
|
|
|
link:RelNotes/1.7.0.5.txt[1.7.0.5],
|
|
|
|
link:RelNotes/1.7.0.4.txt[1.7.0.4],
|
|
|
|
link:RelNotes/1.7.0.3.txt[1.7.0.3],
|
|
|
|
link:RelNotes/1.7.0.2.txt[1.7.0.2],
|
|
|
|
link:RelNotes/1.7.0.1.txt[1.7.0.1],
|
|
|
|
link:RelNotes/1.7.0.txt[1.7.0].
|
2010-02-13 00:45:05 +01:00
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.6.6.3/git.html[documentation for release 1.6.6.3]
|
2009-12-23 20:58:52 +01:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.6.6.3.txt[1.6.6.3],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.6.2.txt[1.6.6.2],
|
|
|
|
link:RelNotes/1.6.6.1.txt[1.6.6.1],
|
|
|
|
link:RelNotes/1.6.6.txt[1.6.6].
|
2009-12-23 20:58:52 +01:00
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.6.5.9/git.html[documentation for release 1.6.5.9]
|
2009-10-10 09:05:19 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.6.5.9.txt[1.6.5.9],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.5.8.txt[1.6.5.8],
|
|
|
|
link:RelNotes/1.6.5.7.txt[1.6.5.7],
|
|
|
|
link:RelNotes/1.6.5.6.txt[1.6.5.6],
|
|
|
|
link:RelNotes/1.6.5.5.txt[1.6.5.5],
|
|
|
|
link:RelNotes/1.6.5.4.txt[1.6.5.4],
|
|
|
|
link:RelNotes/1.6.5.3.txt[1.6.5.3],
|
|
|
|
link:RelNotes/1.6.5.2.txt[1.6.5.2],
|
|
|
|
link:RelNotes/1.6.5.1.txt[1.6.5.1],
|
|
|
|
link:RelNotes/1.6.5.txt[1.6.5].
|
2009-10-10 09:05:19 +02:00
|
|
|
|
2010-12-17 06:43:08 +01:00
|
|
|
* link:v1.6.4.5/git.html[documentation for release 1.6.4.5]
|
2009-07-29 09:32:42 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-12-17 06:43:08 +01:00
|
|
|
link:RelNotes/1.6.4.5.txt[1.6.4.5],
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.4.4.txt[1.6.4.4],
|
|
|
|
link:RelNotes/1.6.4.3.txt[1.6.4.3],
|
|
|
|
link:RelNotes/1.6.4.2.txt[1.6.4.2],
|
|
|
|
link:RelNotes/1.6.4.1.txt[1.6.4.1],
|
|
|
|
link:RelNotes/1.6.4.txt[1.6.4].
|
2009-07-29 09:32:42 +02:00
|
|
|
|
2009-07-29 09:00:56 +02:00
|
|
|
* link:v1.6.3.4/git.html[documentation for release 1.6.3.4]
|
2009-06-04 07:52:37 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.3.4.txt[1.6.3.4],
|
|
|
|
link:RelNotes/1.6.3.3.txt[1.6.3.3],
|
|
|
|
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].
|
2009-03-04 08:02:16 +01:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.2.5.txt[1.6.2.5],
|
|
|
|
link:RelNotes/1.6.2.4.txt[1.6.2.4],
|
|
|
|
link:RelNotes/1.6.2.3.txt[1.6.2.3],
|
|
|
|
link:RelNotes/1.6.2.2.txt[1.6.2.2],
|
|
|
|
link:RelNotes/1.6.2.1.txt[1.6.2.1],
|
|
|
|
link:RelNotes/1.6.2.txt[1.6.2].
|
2009-03-04 08:02:16 +01:00
|
|
|
|
2009-02-07 20:06:34 +01:00
|
|
|
* link:v1.6.1.3/git.html[documentation for release 1.6.1.3]
|
2008-12-25 04:41:08 +01:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.1.3.txt[1.6.1.3],
|
|
|
|
link:RelNotes/1.6.1.2.txt[1.6.1.2],
|
|
|
|
link:RelNotes/1.6.1.1.txt[1.6.1.1],
|
|
|
|
link:RelNotes/1.6.1.txt[1.6.1].
|
2008-12-25 04:41:08 +01:00
|
|
|
|
2008-12-20 04:32:29 +01:00
|
|
|
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
|
2008-08-17 20:42:10 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.6.0.6.txt[1.6.0.6],
|
|
|
|
link:RelNotes/1.6.0.5.txt[1.6.0.5],
|
|
|
|
link:RelNotes/1.6.0.4.txt[1.6.0.4],
|
|
|
|
link:RelNotes/1.6.0.3.txt[1.6.0.3],
|
|
|
|
link:RelNotes/1.6.0.2.txt[1.6.0.2],
|
|
|
|
link:RelNotes/1.6.0.1.txt[1.6.0.1],
|
|
|
|
link:RelNotes/1.6.0.txt[1.6.0].
|
2008-08-17 20:42:10 +02:00
|
|
|
|
2008-12-20 04:32:29 +01:00
|
|
|
* link:v1.5.6.6/git.html[documentation for release 1.5.6.6]
|
2008-06-18 22:09:43 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.6.6.txt[1.5.6.6],
|
|
|
|
link:RelNotes/1.5.6.5.txt[1.5.6.5],
|
|
|
|
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],
|
|
|
|
link:RelNotes/1.5.6.txt[1.5.6].
|
2008-06-18 22:09:43 +02:00
|
|
|
|
2008-12-20 04:32:29 +01:00
|
|
|
* link:v1.5.5.6/git.html[documentation for release 1.5.5.6]
|
2008-04-08 06:57:43 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.5.6.txt[1.5.5.6],
|
|
|
|
link:RelNotes/1.5.5.5.txt[1.5.5.5],
|
|
|
|
link:RelNotes/1.5.5.4.txt[1.5.5.4],
|
|
|
|
link:RelNotes/1.5.5.3.txt[1.5.5.3],
|
|
|
|
link:RelNotes/1.5.5.2.txt[1.5.5.2],
|
|
|
|
link:RelNotes/1.5.5.1.txt[1.5.5.1],
|
|
|
|
link:RelNotes/1.5.5.txt[1.5.5].
|
2008-04-08 06:57:43 +02:00
|
|
|
|
2008-12-20 04:32:29 +01:00
|
|
|
* link:v1.5.4.7/git.html[documentation for release 1.5.4.7]
|
2008-02-02 05:40:30 +01:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.4.7.txt[1.5.4.7],
|
|
|
|
link:RelNotes/1.5.4.6.txt[1.5.4.6],
|
|
|
|
link:RelNotes/1.5.4.5.txt[1.5.4.5],
|
|
|
|
link:RelNotes/1.5.4.4.txt[1.5.4.4],
|
|
|
|
link:RelNotes/1.5.4.3.txt[1.5.4.3],
|
|
|
|
link:RelNotes/1.5.4.2.txt[1.5.4.2],
|
|
|
|
link:RelNotes/1.5.4.1.txt[1.5.4.1],
|
|
|
|
link:RelNotes/1.5.4.txt[1.5.4].
|
2008-02-02 05:40:30 +01:00
|
|
|
|
2008-01-08 08:39:02 +01:00
|
|
|
* link:v1.5.3.8/git.html[documentation for release 1.5.3.8]
|
2007-09-03 00:16:44 +02:00
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.3.8.txt[1.5.3.8],
|
|
|
|
link:RelNotes/1.5.3.7.txt[1.5.3.7],
|
|
|
|
link:RelNotes/1.5.3.6.txt[1.5.3.6],
|
|
|
|
link:RelNotes/1.5.3.5.txt[1.5.3.5],
|
|
|
|
link:RelNotes/1.5.3.4.txt[1.5.3.4],
|
|
|
|
link:RelNotes/1.5.3.3.txt[1.5.3.3],
|
|
|
|
link:RelNotes/1.5.3.2.txt[1.5.3.2],
|
|
|
|
link:RelNotes/1.5.3.1.txt[1.5.3.1],
|
|
|
|
link:RelNotes/1.5.3.txt[1.5.3].
|
2007-05-19 02:28:24 +02:00
|
|
|
|
2008-06-26 02:09:40 +02:00
|
|
|
* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
|
|
|
|
|
2007-05-20 09:30:39 +02:00
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.2.5.txt[1.5.2.5],
|
|
|
|
link:RelNotes/1.5.2.4.txt[1.5.2.4],
|
|
|
|
link:RelNotes/1.5.2.3.txt[1.5.2.3],
|
|
|
|
link:RelNotes/1.5.2.2.txt[1.5.2.2],
|
|
|
|
link:RelNotes/1.5.2.1.txt[1.5.2.1],
|
|
|
|
link:RelNotes/1.5.2.txt[1.5.2].
|
2007-05-20 09:30:39 +02:00
|
|
|
|
|
|
|
* link:v1.5.1.6/git.html[documentation for release 1.5.1.6]
|
|
|
|
|
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.1.6.txt[1.5.1.6],
|
|
|
|
link:RelNotes/1.5.1.5.txt[1.5.1.5],
|
|
|
|
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].
|
2007-05-19 06:43:13 +02:00
|
|
|
|
|
|
|
* link:v1.5.0.7/git.html[documentation for release 1.5.0.7]
|
|
|
|
|
2007-05-20 09:30:39 +02:00
|
|
|
* release notes for
|
2010-09-07 02:29:57 +02:00
|
|
|
link:RelNotes/1.5.0.7.txt[1.5.0.7],
|
|
|
|
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].
|
2007-05-19 06:43:13 +02:00
|
|
|
|
|
|
|
* 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].
|
2007-02-14 00:15:05 +01:00
|
|
|
|
|
|
|
============
|
|
|
|
|
|
|
|
endif::stalenotes[]
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
OPTIONS
|
|
|
|
-------
|
|
|
|
--version::
|
2013-01-21 20:17:53 +01:00
|
|
|
Prints the Git suite version that the 'git' program came from.
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
--help::
|
2006-03-09 17:24:19 +01:00
|
|
|
Prints the synopsis and a list of the most commonly used
|
2007-12-04 06:44:29 +01:00
|
|
|
commands. If the option '--all' or '-a' is given then all
|
2013-01-21 20:17:53 +01:00
|
|
|
available commands are printed. If a Git command is named this
|
2007-12-04 06:44:29 +01:00
|
|
|
option will bring up the manual page for that command.
|
2007-12-04 06:44:29 +01:00
|
|
|
+
|
|
|
|
Other options are available to control how the manual page is
|
2007-12-29 07:20:38 +01:00
|
|
|
displayed. See linkgit:git-help[1] for more information,
|
2008-07-03 08:06:23 +02:00
|
|
|
because `git --help ...` is converted internally into `git
|
|
|
|
help ...`.
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2013-09-09 15:47:43 +02:00
|
|
|
-C <path>::
|
|
|
|
Run as if git was started in '<path>' instead of the current working
|
|
|
|
directory. When multiple `-C` options are given, each subsequent
|
|
|
|
non-absolute `-C <path>` is interpreted relative to the preceding `-C
|
|
|
|
<path>`.
|
|
|
|
+
|
|
|
|
This option affects options that expect path name like `--git-dir` and
|
|
|
|
`--work-tree` in that their interpretations of the path names would be
|
|
|
|
made relative to the working directory caused by the `-C` option. For
|
|
|
|
example the following invocations are equivalent:
|
|
|
|
|
|
|
|
git --git-dir=a.git --work-tree=b -C c status
|
|
|
|
git --git-dir=c/a.git --work-tree=c/b status
|
|
|
|
|
2010-03-26 23:53:57 +01:00
|
|
|
-c <name>=<value>::
|
|
|
|
Pass a configuration parameter to the command. The value
|
|
|
|
given will override values from configuration files.
|
|
|
|
The <name> is expected in the same format as listed by
|
|
|
|
'git config' (subkeys separated by dots).
|
|
|
|
|
2010-10-08 19:31:15 +02:00
|
|
|
--exec-path[=<path>]::
|
2013-01-21 20:17:53 +01:00
|
|
|
Path to wherever your core Git programs are installed.
|
2005-11-16 00:31:25 +01:00
|
|
|
This can also be controlled by setting the GIT_EXEC_PATH
|
2008-07-03 07:08:12 +02:00
|
|
|
environment variable. If no path is given, 'git' will print
|
2005-11-16 00:31:25 +01:00
|
|
|
the current setting and then exit.
|
|
|
|
|
2009-04-05 04:15:16 +02:00
|
|
|
--html-path::
|
2013-01-21 20:17:53 +01:00
|
|
|
Print the path, without trailing slash, where Git's HTML
|
2011-05-02 08:07:45 +02:00
|
|
|
documentation is installed and exit.
|
2009-04-05 04:15:16 +02:00
|
|
|
|
2011-05-01 10:16:25 +02:00
|
|
|
--man-path::
|
2011-05-02 08:07:45 +02:00
|
|
|
Print the manpath (see `man(1)`) for the man pages for
|
2013-01-21 20:17:53 +01:00
|
|
|
this version of Git and exit.
|
2011-05-01 10:16:25 +02:00
|
|
|
|
|
|
|
--info-path::
|
2011-05-02 08:07:45 +02:00
|
|
|
Print the path where the Info files documenting this
|
2013-01-21 20:17:53 +01:00
|
|
|
version of Git are installed and exit.
|
2009-04-05 04:15:16 +02:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-p::
|
|
|
|
--paginate::
|
2010-02-14 13:02:35 +01:00
|
|
|
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).
|
2006-07-25 20:24:22 +02:00
|
|
|
|
2007-08-19 19:24:36 +02:00
|
|
|
--no-pager::
|
2013-01-21 20:17:53 +01:00
|
|
|
Do not pipe Git output into a pager.
|
2007-08-19 19:24:36 +02:00
|
|
|
|
2006-07-25 20:24:22 +02:00
|
|
|
--git-dir=<path>::
|
|
|
|
Set the path to the repository. This can also be controlled by
|
2008-04-28 22:09:20 +02:00
|
|
|
setting the GIT_DIR environment variable. It can be an absolute
|
|
|
|
path or relative path to current working directory.
|
2006-07-25 20:24:22 +02:00
|
|
|
|
2007-06-06 09:10:42 +02:00
|
|
|
--work-tree=<path>::
|
2011-01-24 00:49:41 +01:00
|
|
|
Set the path to the working tree. It can be an absolute path
|
|
|
|
or a path relative to the current working directory.
|
2007-06-06 09:10:42 +02:00
|
|
|
This can also be controlled by setting the GIT_WORK_TREE
|
|
|
|
environment variable and the core.worktree configuration
|
2011-01-24 00:49:41 +01:00
|
|
|
variable (see core.worktree in linkgit:git-config[1] for a
|
|
|
|
more detailed discussion).
|
2007-06-06 09:10:42 +02:00
|
|
|
|
2011-07-09 01:14:10 +02:00
|
|
|
--namespace=<path>::
|
2013-01-21 20:17:53 +01:00
|
|
|
Set the Git namespace. See linkgit:gitnamespaces[7] for more
|
2011-07-09 01:14:10 +02:00
|
|
|
details. Equivalent to setting the `GIT_NAMESPACE` environment
|
|
|
|
variable.
|
|
|
|
|
2006-07-25 20:24:22 +02:00
|
|
|
--bare::
|
2007-08-28 07:41:23 +02:00
|
|
|
Treat the repository as a bare repository. If GIT_DIR
|
|
|
|
environment is not set, it is set to the current working
|
|
|
|
directory.
|
|
|
|
|
2009-10-12 22:30:32 +02:00
|
|
|
--no-replace-objects::
|
2013-01-21 20:17:53 +01:00
|
|
|
Do not use replacement refs to replace Git objects. See
|
2009-10-12 22:30:32 +02:00
|
|
|
linkgit:git-replace[1] for more information.
|
|
|
|
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
--literal-pathspecs::
|
2013-07-14 10:36:07 +02:00
|
|
|
Treat pathspecs literally (i.e. no globbing, no pathspec magic).
|
|
|
|
This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
variable to `1`.
|
|
|
|
|
2013-09-23 20:54:35 +02:00
|
|
|
--glob-pathspecs::
|
2013-07-14 10:36:08 +02:00
|
|
|
Add "glob" magic to all pathspec. This is equivalent to setting
|
|
|
|
the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling
|
|
|
|
globbing on individual pathspecs can be done using pathspec
|
|
|
|
magic ":(literal)"
|
|
|
|
|
2013-09-23 20:54:35 +02:00
|
|
|
--noglob-pathspecs::
|
2013-07-14 10:36:08 +02:00
|
|
|
Add "literal" magic to all pathspec. This is equivalent to setting
|
|
|
|
the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling
|
|
|
|
globbing on individual pathspecs can be done using pathspec
|
|
|
|
magic ":(glob)"
|
2005-12-13 11:38:24 +01:00
|
|
|
|
2013-09-23 20:54:35 +02:00
|
|
|
--icase-pathspecs::
|
2013-07-14 10:36:09 +02:00
|
|
|
Add "icase" magic to all pathspec. This is equivalent to setting
|
|
|
|
the `GIT_ICASE_PATHSPECS` environment variable to `1`.
|
2005-12-13 11:38:24 +01:00
|
|
|
|
2006-04-02 23:54:34 +02:00
|
|
|
GIT COMMANDS
|
|
|
|
------------
|
2005-12-13 11:38:24 +01:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
We divide Git into high level ("porcelain") commands and low level
|
2006-04-02 23:54:34 +02:00
|
|
|
("plumbing") commands.
|
2005-12-10 08:41:03 +01:00
|
|
|
|
2006-04-02 23:54:34 +02:00
|
|
|
High-level commands (porcelain)
|
|
|
|
-------------------------------
|
|
|
|
|
|
|
|
We separate the porcelain commands into the main commands and some
|
|
|
|
ancillary user utilities.
|
|
|
|
|
|
|
|
Main porcelain commands
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~
|
2005-08-27 06:33:46 +02:00
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-mainporcelain.txt[]
|
2005-08-16 00:48:47 +02:00
|
|
|
|
2005-08-15 17:23:06 +02:00
|
|
|
Ancillary Commands
|
2006-04-02 23:54:34 +02:00
|
|
|
~~~~~~~~~~~~~~~~~~
|
2005-07-14 09:10:48 +02:00
|
|
|
Manipulators:
|
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-ancillarymanipulators.txt[]
|
2005-05-10 23:32:37 +02:00
|
|
|
|
2005-08-15 17:23:06 +02:00
|
|
|
Interrogators:
|
2005-05-10 23:32:37 +02:00
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-ancillaryinterrogators.txt[]
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2007-01-19 07:32:38 +01:00
|
|
|
|
|
|
|
Interacting with Others
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
|
|
|
These commands are to interact with foreign SCM and with other
|
|
|
|
people via patch over e-mail.
|
|
|
|
|
|
|
|
include::cmds-foreignscminterface.txt[]
|
|
|
|
|
|
|
|
|
2006-10-29 21:09:48 +01:00
|
|
|
Low-level commands (plumbing)
|
|
|
|
-----------------------------
|
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
Although Git includes its
|
2006-10-29 21:09:48 +01:00
|
|
|
own porcelain layer, its low-level commands are sufficient to support
|
|
|
|
development of alternative porcelains. Developers of such porcelains
|
2007-12-29 07:20:38 +01:00
|
|
|
might start by reading about linkgit:git-update-index[1] and
|
|
|
|
linkgit:git-read-tree[1].
|
2006-10-29 21:09:48 +01:00
|
|
|
|
2007-01-19 07:32:38 +01:00
|
|
|
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
|
2006-10-29 21:09:48 +01:00
|
|
|
the repository, index, and working tree), commands that interrogate and
|
|
|
|
compare objects, and commands that move objects and references between
|
|
|
|
repositories.
|
|
|
|
|
2007-01-19 07:32:38 +01:00
|
|
|
|
2006-10-29 21:09:48 +01:00
|
|
|
Manipulation commands
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-plumbingmanipulators.txt[]
|
2006-10-29 21:09:48 +01:00
|
|
|
|
|
|
|
|
|
|
|
Interrogation commands
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-plumbinginterrogators.txt[]
|
2006-10-29 21:09:48 +01:00
|
|
|
|
|
|
|
In general, the interrogate commands do not touch the files in
|
|
|
|
the working tree.
|
|
|
|
|
|
|
|
|
|
|
|
Synching repositories
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
2007-01-19 00:03:13 +01:00
|
|
|
include::cmds-synchingrepositories.txt[]
|
2006-10-29 21:09:48 +01:00
|
|
|
|
2009-08-07 16:24:21 +02:00
|
|
|
The following are helper commands used by the above; end users
|
2007-01-19 07:32:38 +01:00
|
|
|
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[]
|
|
|
|
|
2006-10-29 21:09:48 +01:00
|
|
|
|
2005-10-29 23:32:56 +02:00
|
|
|
Configuration Mechanism
|
|
|
|
-----------------------
|
|
|
|
|
2013-02-14 16:36:54 +01:00
|
|
|
Git uses a simple text format to store customizations that are per
|
|
|
|
repository and are per user. Such a configuration file may look
|
|
|
|
like this:
|
2005-10-29 23:32:56 +02:00
|
|
|
|
|
|
|
------------
|
|
|
|
#
|
2005-12-08 01:05:21 +01:00
|
|
|
# A '#' or ';' character indicates a comment.
|
2005-10-29 23:32:56 +02:00
|
|
|
#
|
|
|
|
|
|
|
|
; core variables
|
|
|
|
[core]
|
|
|
|
; Don't trust file modes
|
|
|
|
filemode = false
|
|
|
|
|
|
|
|
; user identity
|
|
|
|
[user]
|
|
|
|
name = "Junio C Hamano"
|
2013-02-14 16:36:54 +01:00
|
|
|
email = "gitster@pobox.com"
|
2005-10-29 23:32:56 +02:00
|
|
|
|
|
|
|
------------
|
|
|
|
|
|
|
|
Various commands read from the configuration file and adjust
|
2010-02-14 13:02:35 +01:00
|
|
|
their operation accordingly. See linkgit:git-config[1] for a
|
2013-02-14 16:36:54 +01:00
|
|
|
list and more details about the configuration mechanism.
|
2005-10-29 23:32:56 +02:00
|
|
|
|
|
|
|
|
2005-05-22 19:44:16 +02:00
|
|
|
Identifier Terminology
|
2005-05-10 23:32:30 +02:00
|
|
|
----------------------
|
|
|
|
<object>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates the object name for any type of object.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
<blob>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates a blob object name.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
<tree>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates a tree object name.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
<commit>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates a commit object name.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
<tree-ish>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates a tree, commit or tag object name. A
|
2005-05-22 19:44:16 +02:00
|
|
|
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>.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2007-03-05 20:46:05 +01:00
|
|
|
<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>.
|
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
<type>::
|
|
|
|
Indicates that an object type is required.
|
2005-12-08 01:05:21 +01:00
|
|
|
Currently one of: `blob`, `tree`, `commit`, or `tag`.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
<file>::
|
2005-12-08 01:05:21 +01:00
|
|
|
Indicates a filename - almost always relative to the
|
|
|
|
root of the tree structure `GIT_INDEX_FILE` describes.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2005-05-10 23:32:38 +02:00
|
|
|
Symbolic Identifiers
|
|
|
|
--------------------
|
2013-01-21 20:17:53 +01:00
|
|
|
Any Git command accepting any <object> can also use the following
|
2005-05-22 19:44:16 +02:00
|
|
|
symbolic notation:
|
2005-05-10 23:32:38 +02:00
|
|
|
|
|
|
|
HEAD::
|
2011-06-23 18:35:10 +02:00
|
|
|
indicates the head of the current branch.
|
2005-12-08 01:05:21 +01:00
|
|
|
|
2005-05-10 23:32:38 +02:00
|
|
|
<tag>::
|
2005-12-08 01:05:21 +01:00
|
|
|
a valid tag 'name'
|
2011-06-23 18:35:10 +02:00
|
|
|
(i.e. a `refs/tags/<tag>` reference).
|
2005-12-08 01:05:21 +01:00
|
|
|
|
2005-05-10 23:32:38 +02:00
|
|
|
<head>::
|
2005-12-08 01:05:21 +01:00
|
|
|
a valid head 'name'
|
2011-06-23 18:35:10 +02:00
|
|
|
(i.e. a `refs/heads/<head>` reference).
|
2005-12-08 01:05:21 +01:00
|
|
|
|
2006-10-25 20:33:08 +02:00
|
|
|
For a more complete list of ways to spell object names, see
|
2010-10-11 18:03:32 +02:00
|
|
|
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
|
2006-10-25 20:33:08 +02:00
|
|
|
|
2005-05-10 23:32:38 +02:00
|
|
|
|
|
|
|
File/Directory Structure
|
|
|
|
------------------------
|
|
|
|
|
2008-07-01 00:01:21 +02:00
|
|
|
Please see the linkgit:gitrepository-layout[5] document.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
2008-07-01 00:01:21 +02:00
|
|
|
Read linkgit:githooks[5] for more details about each hook.
|
2006-03-25 04:21:07 +01:00
|
|
|
|
2005-05-10 23:32:38 +02:00
|
|
|
Higher level SCMs may provide and manage additional information in the
|
2005-12-08 01:05:21 +01:00
|
|
|
`$GIT_DIR`.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
2005-09-02 01:56:13 +02:00
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
Terminology
|
|
|
|
-----------
|
2008-07-01 00:01:21 +02:00
|
|
|
Please see linkgit:gitglossary[7].
|
2005-05-10 23:32:30 +02:00
|
|
|
|
|
|
|
|
|
|
|
Environment Variables
|
|
|
|
---------------------
|
2013-01-21 20:17:53 +01:00
|
|
|
Various Git commands use the following environment variables:
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
The Git Repository
|
2005-05-10 23:32:38 +02:00
|
|
|
~~~~~~~~~~~~~~~~~~
|
2013-01-21 20:17:53 +01:00
|
|
|
These environment variables apply to 'all' core Git commands. Nb: it
|
2005-05-10 23:32:38 +02:00
|
|
|
is worth noting that they may be used/overridden by SCMS sitting above
|
2013-01-21 20:17:53 +01:00
|
|
|
Git so take care if using Cogito etc.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
|
|
|
'GIT_INDEX_FILE'::
|
|
|
|
This environment allows the specification of an alternate
|
2005-11-11 02:12:27 +01:00
|
|
|
index file. If not specified, the default of `$GIT_DIR/index`
|
|
|
|
is used.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
|
|
|
'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'::
|
2013-01-21 20:17:53 +01:00
|
|
|
Due to the immutable nature of Git objects, old objects can be
|
2005-05-10 23:32:38 +02:00
|
|
|
archived into shared, read-only directories. This variable
|
2007-12-03 21:55:57 +01:00
|
|
|
specifies a ":" separated (on Windows ";" separated) list
|
2013-01-21 20:17:53 +01:00
|
|
|
of Git object directories which can be used to search for Git
|
2007-12-03 21:55:57 +01:00
|
|
|
objects. New objects will not be written to these directories.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
|
|
|
'GIT_DIR'::
|
2005-12-08 01:05:21 +01:00
|
|
|
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.
|
2012-12-13 18:57:19 +01:00
|
|
|
The '--git-dir' command-line option also sets this value.
|
2005-05-10 23:32:38 +02:00
|
|
|
|
2007-06-06 09:10:42 +02:00
|
|
|
'GIT_WORK_TREE'::
|
2013-05-31 03:11:41 +02:00
|
|
|
Set the path to the root of the working tree.
|
2007-06-06 09:10:42 +02:00
|
|
|
This can also be controlled by the '--work-tree' command line
|
|
|
|
option and the core.worktree configuration variable.
|
|
|
|
|
2011-07-09 01:14:10 +02:00
|
|
|
'GIT_NAMESPACE'::
|
2013-01-21 20:17:53 +01:00
|
|
|
Set the Git namespace; see linkgit:gitnamespaces[7] for details.
|
2011-07-09 01:14:10 +02:00
|
|
|
The '--namespace' command-line option also sets this value.
|
|
|
|
|
2008-05-20 08:49:26 +02:00
|
|
|
'GIT_CEILING_DIRECTORIES'::
|
Provide a mechanism to turn off symlink resolution in ceiling paths
Commit 1b77d83cab 'setup_git_directory_gently_1(): resolve symlinks
in ceiling paths' changed the setup code to resolve symlinks in the
entries in GIT_CEILING_DIRECTORIES. Because those entries are
compared textually to the symlink-resolved current directory, an
entry in GIT_CEILING_DIRECTORIES that contained a symlink would have
no effect. It was known that this could cause performance problems
if the symlink resolution *itself* touched slow filesystems, but it
was thought that such use cases would be unlikely. The intention of
the earlier change was to deal with a case when the user has this:
GIT_CEILING_DIRECTORIES=/home/gitster
but in reality, /home/gitster is a symbolic link to somewhere else,
e.g. /net/machine/home4/gitster. A textual comparison between the
specified value /home/gitster and the location getcwd(3) returns
would not help us, but readlink("/home/gitster") would still be
fast.
After this change was released, Anders Kaseorg <andersk@mit.edu>
reported:
> [...] my computer has been acting so slow when I’m not connected to
> the network. I put various network filesystem paths in
> $GIT_CEILING_DIRECTORIES, such as
> /afs/athena.mit.edu/user/a/n/andersk (to avoid hitting its parents
> /afs/athena.mit.edu, /afs/athena.mit.edu/user/a, and
> /afs/athena.mit.edu/user/a/n which all live in different AFS
> volumes). Now when I’m not connected to the network, every
> invocation of Git, including the __git_ps1 in my shell prompt, waits
> for AFS to timeout.
To allow users to work around this problem, give them a mechanism to
turn off symlink resolution in GIT_CEILING_DIRECTORIES entries. All
the entries that follow an empty entry will not be checked for symbolic
links and used literally in comparison. E.g. with these:
GIT_CEILING_DIRECTORIES=:/foo/bar:/xyzzy or
GIT_CEILING_DIRECTORIES=/foo/bar::/xyzzy
we will not readlink("/xyzzy") because it comes after an empty entry.
With the former (but not with the latter), "/foo/bar" comes after an
empty entry, and we will not readlink it, either.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 10:09:24 +01:00
|
|
|
This should be a colon-separated list of absolute paths. If
|
2013-02-27 18:47:27 +01:00
|
|
|
set, it is a list of directories that Git should not chdir up
|
Provide a mechanism to turn off symlink resolution in ceiling paths
Commit 1b77d83cab 'setup_git_directory_gently_1(): resolve symlinks
in ceiling paths' changed the setup code to resolve symlinks in the
entries in GIT_CEILING_DIRECTORIES. Because those entries are
compared textually to the symlink-resolved current directory, an
entry in GIT_CEILING_DIRECTORIES that contained a symlink would have
no effect. It was known that this could cause performance problems
if the symlink resolution *itself* touched slow filesystems, but it
was thought that such use cases would be unlikely. The intention of
the earlier change was to deal with a case when the user has this:
GIT_CEILING_DIRECTORIES=/home/gitster
but in reality, /home/gitster is a symbolic link to somewhere else,
e.g. /net/machine/home4/gitster. A textual comparison between the
specified value /home/gitster and the location getcwd(3) returns
would not help us, but readlink("/home/gitster") would still be
fast.
After this change was released, Anders Kaseorg <andersk@mit.edu>
reported:
> [...] my computer has been acting so slow when I’m not connected to
> the network. I put various network filesystem paths in
> $GIT_CEILING_DIRECTORIES, such as
> /afs/athena.mit.edu/user/a/n/andersk (to avoid hitting its parents
> /afs/athena.mit.edu, /afs/athena.mit.edu/user/a, and
> /afs/athena.mit.edu/user/a/n which all live in different AFS
> volumes). Now when I’m not connected to the network, every
> invocation of Git, including the __git_ps1 in my shell prompt, waits
> for AFS to timeout.
To allow users to work around this problem, give them a mechanism to
turn off symlink resolution in GIT_CEILING_DIRECTORIES entries. All
the entries that follow an empty entry will not be checked for symbolic
links and used literally in comparison. E.g. with these:
GIT_CEILING_DIRECTORIES=:/foo/bar:/xyzzy or
GIT_CEILING_DIRECTORIES=/foo/bar::/xyzzy
we will not readlink("/xyzzy") because it comes after an empty entry.
With the former (but not with the latter), "/foo/bar" comes after an
empty entry, and we will not readlink it, either.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-02-20 10:09:24 +01:00
|
|
|
into while looking for a repository directory (useful for
|
|
|
|
excluding slow-loading network directories). It will not
|
|
|
|
exclude the current working directory or a GIT_DIR set on the
|
|
|
|
command line or in the environment. Normally, Git has to read
|
|
|
|
the entries in this list and resolve any symlink that
|
|
|
|
might be present in order to compare them with the current
|
|
|
|
directory. However, if even this access is slow, you
|
|
|
|
can add an empty entry to the list to tell Git that the
|
|
|
|
subsequent entries are not symlinks and needn't be resolved;
|
|
|
|
e.g.,
|
|
|
|
'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'.
|
2008-05-20 08:49:26 +02:00
|
|
|
|
2010-04-04 23:49:31 +02:00
|
|
|
'GIT_DISCOVERY_ACROSS_FILESYSTEM'::
|
2010-04-04 19:33:53 +02:00
|
|
|
When run in a directory that does not have ".git" repository
|
2013-01-21 20:17:53 +01:00
|
|
|
directory, Git tries to find such a directory in the parent
|
2010-04-04 19:33:53 +02:00
|
|
|
directories to find the top of the working tree, but by default it
|
|
|
|
does not cross filesystem boundaries. This environment variable
|
2013-01-21 20:17:53 +01:00
|
|
|
can be set to true to tell Git not to stop at filesystem
|
2010-04-04 23:49:31 +02:00
|
|
|
boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect
|
|
|
|
an explicit repository directory set via 'GIT_DIR' or on the
|
|
|
|
command line.
|
2010-03-17 20:55:53 +01:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
Git Commits
|
2005-05-10 23:32:38 +02:00
|
|
|
~~~~~~~~~~~
|
|
|
|
'GIT_AUTHOR_NAME'::
|
|
|
|
'GIT_AUTHOR_EMAIL'::
|
|
|
|
'GIT_AUTHOR_DATE'::
|
|
|
|
'GIT_COMMITTER_NAME'::
|
|
|
|
'GIT_COMMITTER_EMAIL'::
|
2007-04-29 03:40:12 +02:00
|
|
|
'GIT_COMMITTER_DATE'::
|
2007-04-29 03:40:28 +02:00
|
|
|
'EMAIL'::
|
2007-12-29 07:20:38 +01:00
|
|
|
see linkgit:git-commit-tree[1]
|
2005-05-10 23:32:38 +02:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
Git Diffs
|
2005-05-10 23:32:38 +02:00
|
|
|
~~~~~~~~~
|
2005-05-11 05:54:57 +02:00
|
|
|
'GIT_DIFF_OPTS'::
|
2006-11-27 20:37:43 +01:00
|
|
|
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
|
2013-01-21 20:17:53 +01:00
|
|
|
value passed on the Git diff command line.
|
2006-11-27 20:37:43 +01:00
|
|
|
|
2005-05-11 05:54:57 +02:00
|
|
|
'GIT_EXTERNAL_DIFF'::
|
2006-11-27 20:37:43 +01:00
|
|
|
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>,
|
2013-04-15 19:49:04 +02:00
|
|
|
<old|new>-hex:: are the 40-hexdigit SHA-1 hashes,
|
2006-11-27 20:37:43 +01:00
|
|
|
<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>.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2006-06-25 15:56:18 +02:00
|
|
|
other
|
|
|
|
~~~~~
|
2007-07-13 01:54:06 +02:00
|
|
|
'GIT_MERGE_VERBOSITY'::
|
|
|
|
A number controlling the amount of output shown by
|
|
|
|
the recursive merge strategy. Overrides merge.verbosity.
|
2007-12-29 07:20:38 +01:00
|
|
|
See linkgit:git-merge[1]
|
2007-07-13 01:54:06 +02:00
|
|
|
|
2006-07-31 15:27:00 +02:00
|
|
|
'GIT_PAGER'::
|
2007-07-19 12:43:51 +02:00
|
|
|
This environment variable overrides `$PAGER`. If it is set
|
2013-01-21 20:17:53 +01:00
|
|
|
to an empty string or to the value "cat", Git will not launch
|
2008-08-24 07:28:32 +02:00
|
|
|
a pager. See also the `core.pager` option in
|
|
|
|
linkgit:git-config[1].
|
2006-07-31 15:27:00 +02:00
|
|
|
|
2012-03-23 13:38:42 +01:00
|
|
|
'GIT_EDITOR'::
|
|
|
|
This environment variable overrides `$EDITOR` and `$VISUAL`.
|
2013-01-21 20:17:53 +01:00
|
|
|
It is used by several Git commands when, on interactive mode,
|
2012-03-23 13:38:42 +01:00
|
|
|
an editor is to be launched. See also linkgit:git-var[1]
|
|
|
|
and the `core.editor` option in linkgit:git-config[1].
|
|
|
|
|
2007-08-04 08:06:52 +02:00
|
|
|
'GIT_SSH'::
|
2010-01-10 00:33:00 +01:00
|
|
|
If this environment variable is set then 'git fetch'
|
|
|
|
and 'git push' will use this command instead
|
2008-07-03 07:55:07 +02:00
|
|
|
of 'ssh' when they need to connect to a remote system.
|
2013-03-22 00:06:40 +01:00
|
|
|
The '$GIT_SSH' command will be given exactly two or
|
|
|
|
four arguments: the 'username@host' (or just 'host')
|
|
|
|
from the URL and the shell command to execute on that
|
|
|
|
remote system, optionally preceded by '-p' (literally) and
|
|
|
|
the 'port' from the URL when it specifies something other
|
|
|
|
than the default SSH port.
|
2007-08-04 08:06:52 +02:00
|
|
|
+
|
|
|
|
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.
|
|
|
|
|
2010-08-30 15:40:29 +02:00
|
|
|
'GIT_ASKPASS'::
|
2013-01-21 20:17:53 +01:00
|
|
|
If this environment variable is set, then Git commands which need to
|
2010-08-30 15:40:29 +02:00
|
|
|
acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
|
|
|
|
will call this program with a suitable prompt as command line argument
|
|
|
|
and read the password from its STDOUT. See also the 'core.askpass'
|
|
|
|
option in linkgit:git-config[1].
|
|
|
|
|
2012-10-14 10:53:59 +02:00
|
|
|
'GIT_CONFIG_NOSYSTEM'::
|
|
|
|
Whether to skip reading settings from the system-wide
|
|
|
|
`$(prefix)/etc/gitconfig` file. This environment variable can
|
|
|
|
be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a
|
|
|
|
predictable environment for a picky script, or you can set it
|
|
|
|
temporarily to avoid using a buggy `/etc/gitconfig` file while
|
|
|
|
waiting for someone with sufficient permissions to fix it.
|
|
|
|
|
2007-06-29 19:40:46 +02:00
|
|
|
'GIT_FLUSH'::
|
|
|
|
If this environment variable is set to "1", then commands such
|
2010-01-10 00:33:00 +01:00
|
|
|
as 'git blame' (in incremental mode), 'git rev-list', 'git log',
|
core-tutorial: trim the section on Inspecting Changes
Back when the core tutorial was written, `log` and `whatchanged`
were scripted Porcelains. In the "Inspecting Changes" section that
talks about the plumbing commands in the diff family, it made sense
to use `log` and `whatchanged` as good examples of the use of these
plumbing commands, and because even these scripted Porcelains were
novelty (there wasn't the new end-user tutorial written), it made
some sense to illustrate uses of the `git log` (and `git
whatchanged`) scripted Porcelain commands.
But we no longer have scripted `log` and `whatchanged` to serve as
examples, and this document is not where the end users learn what
`git log` command is about. Stop at briefly mentioning the
possibility of combining rev-list with diff-tree to build your own
log, and leave the end-user documentation of `log` to the new
tutorial and the user manual.
Also resurrect the last version of `git-log`, `git-whatchanged`, and
`git-show` to serve as examples to contrib/examples/ directory.
While at it, remove 'whatchanged' from a list of sample commands
that are affected by GIT_FLUSH environment variable. This is not
meant to be an exhaustive list but as a list of typical ones, and an
old command that is kept primarily for backward compatibility does
not belong to it.
Helped-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-09 19:28:53 +02:00
|
|
|
'git check-attr' and 'git check-ignore' will
|
2013-04-11 14:05:13 +02:00
|
|
|
force a flush of the output stream after each record have been
|
|
|
|
flushed. If this
|
2007-06-29 19:40:46 +02:00
|
|
|
variable is set to "0", the output of these commands will be done
|
|
|
|
using completely buffered I/O. If this environment variable is
|
2013-01-21 20:17:53 +01:00
|
|
|
not set, Git will choose buffered or record-oriented flushing
|
2007-06-29 19:40:46 +02:00
|
|
|
based on whether stdout appears to be redirected to a file or not.
|
|
|
|
|
2006-06-25 15:56:18 +02:00
|
|
|
'GIT_TRACE'::
|
2006-09-03 17:32:24 +02:00
|
|
|
If this variable is set to "1", "2" or "true" (comparison
|
2013-01-21 20:17:53 +01:00
|
|
|
is case insensitive), Git will print `trace:` messages on
|
2006-06-25 15:56:18 +02:00
|
|
|
stderr telling about alias expansion, built-in command
|
|
|
|
execution and external command execution.
|
2006-09-03 17:32:24 +02:00
|
|
|
If this variable is set to an integer value greater than 1
|
2013-01-21 20:17:53 +01:00
|
|
|
and lower than 10 (strictly) then Git will interpret this
|
2006-09-03 17:32:24 +02:00
|
|
|
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
|
2013-01-21 20:17:53 +01:00
|
|
|
(starting with a '/' character), Git will interpret this
|
2006-09-03 17:32:24 +02:00
|
|
|
as a file path and will try to write the trace messages
|
|
|
|
into it.
|
2006-06-25 15:56:18 +02:00
|
|
|
|
2013-06-09 07:22:48 +02:00
|
|
|
'GIT_TRACE_PACK_ACCESS'::
|
|
|
|
If this variable is set to a path, a file will be created at
|
|
|
|
the given path logging all accesses to any packs. For each
|
|
|
|
access, the pack file name and an offset in the pack is
|
|
|
|
recorded. This may be helpful for troubleshooting some
|
|
|
|
pack-related performance problems.
|
|
|
|
|
2013-06-09 07:22:49 +02:00
|
|
|
'GIT_TRACE_PACKET'::
|
|
|
|
If this variable is set, it shows a trace of all packets
|
|
|
|
coming in or out of a given program. This can help with
|
|
|
|
debugging object negotiation or other protocol issues. Tracing
|
|
|
|
is turned off at a packet starting with "PACK".
|
|
|
|
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
GIT_LITERAL_PATHSPECS::
|
2013-01-21 20:17:53 +01:00
|
|
|
Setting this variable to `1` will cause Git to treat all
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
pathspecs literally, rather than as glob patterns. For example,
|
|
|
|
running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search
|
|
|
|
for commits that touch the path `*.c`, not any paths that the
|
|
|
|
glob `*.c` matches. You might want this if you are feeding
|
2013-01-21 20:17:53 +01:00
|
|
|
literal paths to Git (e.g., paths previously given to you by
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
`git ls-tree`, `--raw` diff output, etc).
|
|
|
|
|
2013-07-14 10:36:08 +02:00
|
|
|
GIT_GLOB_PATHSPECS::
|
|
|
|
Setting this variable to `1` will cause Git to treat all
|
|
|
|
pathspecs as glob patterns (aka "glob" magic).
|
|
|
|
|
|
|
|
GIT_NOGLOB_PATHSPECS::
|
|
|
|
Setting this variable to `1` will cause Git to treat all
|
|
|
|
pathspecs as literal (aka "literal" magic).
|
|
|
|
|
2013-07-14 10:36:09 +02:00
|
|
|
GIT_ICASE_PATHSPECS::
|
|
|
|
Setting this variable to `1` will cause Git to treat all
|
|
|
|
pathspecs as case-insensitive.
|
|
|
|
|
setup_reflog_action: document the rules for using GIT_REFLOG_ACTION
The set_reflog_action helper (in git-sh-setup) is designed to be
used once at the very top of a program, like this in "git am", for
example:
set_reflog_action am
The helper function sets the given string to GIT_REFLOG_ACTION only
when GIT_REFLOG_ACTION is not yet set. Thanks to this, "git am",
when run as the top-level program, will use "am" in GIT_REFLOG_ACTION
and the reflog entries made by whatever it does will record the
updates of refs done by "am".
Because of the conditional assignment, when "git am" is run as a
subprogram (i.e. an implementation detail) of "git rebase" that
already sets GIT_REFLOG_ACTION to its own name, the call in "git am"
to the helper function at the beginning will *not* have any effect.
So "git rebase" can do this:
set_reflog_action rebase
... do its own preparation, like checking out "onto" commit
... decide to do "format-patch" to "am" pipeline
git format-patch --stdout >mbox
git am mbox
and the reflog entries made inside "git am" invocation will say
"rebase", not "am".
Calls to "git" commands that update refs would use GIT_REFLOG_ACTION
to record who did that update. Most such calls in scripted Porcelains
do not define custom reflog message and rely on GIT_REFLOG_ACTION to
contain its (or its caller's, when it is called as a subprogram) name.
If a scripted Porcelain wants to record a custom reflog message for
a single invocation of "git" command (e.g. when "git rebase" uses
"git checkout" to detach HEAD at the commit a series is to be
replayed on), it needs to set GIT_REFLOG_ACTION to the custom
message and export it while calling the "git" command, but such an
assignment must be restricted to that single "git" invocation and
should not be left behind to affect later codepath.
Document the rules to avoid future confusion.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-06-19 19:54:00 +02:00
|
|
|
'GIT_REFLOG_ACTION'::
|
|
|
|
When a ref is updated, reflog entries are created to keep
|
|
|
|
track of the reason why the ref was updated (which is
|
|
|
|
typically the name of the high-level command that updated
|
|
|
|
the ref), in addition to the old and new values of the ref.
|
|
|
|
A scripted Porcelain command can use set_reflog_action
|
|
|
|
helper function in `git-sh-setup` to set its name to this
|
|
|
|
variable when it is invoked as the top level command by the
|
|
|
|
end user, to be recorded in the body of the reflog.
|
|
|
|
|
add global --literal-pathspecs option
Git takes pathspec arguments in many places to limit the
scope of an operation. These pathspecs are treated not as
literal paths, but as glob patterns that can be fed to
fnmatch. When a user is giving a specific pattern, this is a
nice feature.
However, when programatically providing pathspecs, it can be
a nuisance. For example, to find the latest revision which
modified "$foo", one can use "git rev-list -- $foo". But if
"$foo" contains glob characters (e.g., "f*"), it will
erroneously match more entries than desired. The caller
needs to quote the characters in $foo, and even then, the
results may not be exactly the same as with a literal
pathspec. For instance, the depth checks in
match_pathspec_depth do not kick in if we match via fnmatch.
This patch introduces a global command-line option (i.e.,
one for "git" itself, not for specific commands) to turn
this behavior off. It also has a matching environment
variable, which can make it easier if you are a script or
porcelain interface that is going to issue many such
commands.
This option cannot turn off globbing for particular
pathspecs. That could eventually be done with a ":(noglob)"
magic pathspec prefix. However, that level of granularity is
more cumbersome to use for many cases, and doing ":(noglob)"
right would mean converting the whole codebase to use
"struct pathspec", as the usual "const char **pathspec"
cannot represent extra per-item flags.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-19 23:37:30 +01:00
|
|
|
|
2005-08-30 22:51:01 +02:00
|
|
|
Discussion[[Discussion]]
|
|
|
|
------------------------
|
2007-09-03 06:01:19 +02:00
|
|
|
|
|
|
|
More detail on the following is available from the
|
2013-01-21 20:17:53 +01:00
|
|
|
link:user-manual.html#git-concepts[Git concepts chapter of the
|
2008-07-01 00:01:21 +02:00
|
|
|
user-manual] and linkgit:gitcore-tutorial[7].
|
2007-09-03 06:01:19 +02:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
A Git project normally consists of a working directory with a ".git"
|
2007-09-03 06:01:19 +02:00
|
|
|
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
|
2007-12-18 07:07:36 +01:00
|
|
|
directory hierarchies; and commits, which each reference a single tree
|
2007-09-03 06:01:19 +02:00
|
|
|
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.
|
|
|
|
|
2013-04-15 19:49:04 +02:00
|
|
|
All objects are named by the SHA-1 hash of their contents, normally
|
2007-09-03 06:01:19 +02:00
|
|
|
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
|
2013-04-15 19:49:04 +02:00
|
|
|
may contain the SHA-1 name of an object or the name of another ref. Refs
|
|
|
|
with names beginning `ref/head/` contain the SHA-1 name of the most
|
|
|
|
recent commit (or "head") of a branch under development. SHA-1 names of
|
2007-09-03 06:01:19 +02:00
|
|
|
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.
|
2005-05-22 19:44:16 +02:00
|
|
|
|
2012-08-17 21:48:52 +02:00
|
|
|
FURTHER DOCUMENTATION
|
|
|
|
---------------------
|
|
|
|
|
|
|
|
See the references in the "description" section to get started
|
2013-01-21 20:17:53 +01:00
|
|
|
using Git. The following is probably more detail than necessary
|
2012-08-17 21:48:52 +02:00
|
|
|
for a first-time user.
|
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
The link:user-manual.html#git-concepts[Git concepts chapter of the
|
2012-08-17 21:48:52 +02:00
|
|
|
user-manual] and linkgit:gitcore-tutorial[7] both provide
|
2013-01-21 20:17:53 +01:00
|
|
|
introductions to the underlying Git architecture.
|
2012-08-17 21:48:52 +02:00
|
|
|
|
|
|
|
See linkgit:gitworkflows[7] for an overview of recommended workflows.
|
|
|
|
|
|
|
|
See also the link:howto-index.html[howto] documents for some useful
|
|
|
|
examples.
|
|
|
|
|
|
|
|
The internals are documented in the
|
2013-01-21 20:16:20 +01:00
|
|
|
link:technical/api-index.html[Git API documentation].
|
2012-08-17 21:48:52 +02:00
|
|
|
|
|
|
|
Users migrating from CVS may also want to
|
|
|
|
read linkgit:gitcvs-migration[7].
|
|
|
|
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
Authors
|
|
|
|
-------
|
2011-03-11 06:52:08 +01:00
|
|
|
Git was started by Linus Torvalds, and is currently maintained by Junio
|
2013-01-21 20:17:53 +01:00
|
|
|
C Hamano. Numerous contributions have come from the Git mailing list
|
2012-12-12 19:06:24 +01:00
|
|
|
<git@vger.kernel.org>. http://www.ohloh.net/p/git/contributors/summary
|
|
|
|
gives you a more complete list of contributors.
|
|
|
|
|
|
|
|
If you have a clone of git.git itself, the
|
2011-03-13 04:00:38 +01:00
|
|
|
output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
|
|
|
|
the authors for specific parts of the project.
|
2005-05-10 23:32:30 +02:00
|
|
|
|
2010-08-02 18:07:39 +02:00
|
|
|
Reporting Bugs
|
|
|
|
--------------
|
|
|
|
|
|
|
|
Report bugs to the Git mailing list <git@vger.kernel.org> where the
|
|
|
|
development and maintenance is primarily done. You do not have to be
|
|
|
|
subscribed to the list to send a message there.
|
|
|
|
|
2008-05-29 19:21:46 +02:00
|
|
|
SEE ALSO
|
|
|
|
--------
|
|
|
|
linkgit:gittutorial[7], linkgit:gittutorial-2[7],
|
2008-08-02 23:41:48 +02:00
|
|
|
link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7],
|
2008-05-29 19:21:46 +02:00
|
|
|
linkgit:gitglossary[7], linkgit:gitcore-tutorial[7],
|
2009-06-06 15:11:07 +02:00
|
|
|
linkgit:gitcli[7], link:user-manual.html[The Git User's Manual],
|
|
|
|
linkgit:gitworkflows[7]
|
2008-05-29 19:21:46 +02:00
|
|
|
|
2005-05-10 23:32:30 +02:00
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|