Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 1 | git(1) |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 2 | ====== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git - the stupid content tracker |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
Junio C Hamano | 6b2cee1 | 2006-08-26 08:43:31 | [diff] [blame] | 11 | [verse] |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 12 | 'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path] |
Junio C Hamano | 3d23a0a | 2009-10-19 08:04:30 | [diff] [blame] | 13 | [-p|--paginate|--no-pager] [--no-replace-objects] |
Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 14 | [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] |
Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 15 | [-c name=value] |
Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 16 | [--help] COMMAND [ARGS] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 17 | |
| 18 | DESCRIPTION |
| 19 | ----------- |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 20 | Git is a fast, scalable, distributed revision control system with an |
| 21 | unusually rich command set that provides both high-level operations |
| 22 | and full access to internals. |
| 23 | |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 24 | See linkgit:gittutorial[7] to get started, then see |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 25 | link:everyday.html[Everyday Git] for a useful minimum set of commands, and |
| 26 | "man git-commandname" for documentation of each command. CVS users may |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 27 | also want to read linkgit:gitcvs-migration[7]. See |
| 28 | the link:user-manual.html[Git User's Manual] for a more in-depth |
Junio C Hamano | 3d30fd5 | 2007-05-08 00:32:53 | [diff] [blame] | 29 | introduction. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 30 | |
Junio C Hamano | 33db437 | 2006-06-07 19:51:45 | [diff] [blame] | 31 | The COMMAND is either a name of a Git command (see below) or an alias |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 32 | as defined in the configuration file (see linkgit:git-config[1]). |
Junio C Hamano | 33db437 | 2006-06-07 19:51:45 | [diff] [blame] | 33 | |
Junio C Hamano | b63afff | 2007-05-01 03:05:55 | [diff] [blame] | 34 | Formatted and hyperlinked version of the latest git |
| 35 | documentation can be viewed at |
| 36 | `http://www.kernel.org/pub/software/scm/git/docs/`. |
| 37 | |
Junio C Hamano | 9d52e57 | 2007-02-13 23:48:20 | [diff] [blame] | 38 | ifdef::stalenotes[] |
| 39 | [NOTE] |
| 40 | ============ |
Junio C Hamano | 9d52e57 | 2007-02-13 23:48:20 | [diff] [blame] | 41 | |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 42 | You are reading the documentation for the latest (possibly |
| 43 | unreleased) version of git, that is available from 'master' |
| 44 | branch of the `git.git` repository. |
| 45 | Documentation for older releases are available here: |
Junio C Hamano | 2fc9260 | 2007-03-29 01:09:46 | [diff] [blame] | 46 | |
Junio C Hamano | 08acb73 | 2010-07-21 21:58:33 | [diff] [blame^] | 47 | * link:v1.7.2/git.html[documentation for release 1.7.2] |
| 48 | |
| 49 | * release notes for |
| 50 | link:RelNotes-1.7.2.txt[1.7.2]. |
| 51 | |
Junio C Hamano | 7d44952 | 2010-07-01 00:08:51 | [diff] [blame] | 52 | * link:v1.7.1.1/git.html[documentation for release 1.7.1.1] |
Junio C Hamano | fc5d735 | 2010-04-24 02:59:11 | [diff] [blame] | 53 | |
| 54 | * release notes for |
Junio C Hamano | 7d44952 | 2010-07-01 00:08:51 | [diff] [blame] | 55 | link:RelNotes-1.7.1.1.txt[1.7.1.1], |
Junio C Hamano | fc5d735 | 2010-04-24 02:59:11 | [diff] [blame] | 56 | link:RelNotes-1.7.1.txt[1.7.1]. |
| 57 | |
Junio C Hamano | f703a39 | 2010-04-23 06:56:02 | [diff] [blame] | 58 | * link:v1.7.0.6/git.html[documentation for release 1.7.0.6] |
Junio C Hamano | dca3482 | 2010-02-13 01:02:52 | [diff] [blame] | 59 | |
| 60 | * release notes for |
Junio C Hamano | f703a39 | 2010-04-23 06:56:02 | [diff] [blame] | 61 | link:RelNotes-1.7.0.6.txt[1.7.0.6], |
Junio C Hamano | 0e8c0b0 | 2010-04-12 15:45:55 | [diff] [blame] | 62 | link:RelNotes-1.7.0.5.txt[1.7.0.5], |
Junio C Hamano | 1f630d5 | 2010-04-01 04:49:25 | [diff] [blame] | 63 | link:RelNotes-1.7.0.4.txt[1.7.0.4], |
Junio C Hamano | 9ccf664 | 2010-03-22 01:47:35 | [diff] [blame] | 64 | link:RelNotes-1.7.0.3.txt[1.7.0.3], |
Junio C Hamano | 636c8b2 | 2010-03-07 22:25:17 | [diff] [blame] | 65 | link:RelNotes-1.7.0.2.txt[1.7.0.2], |
Junio C Hamano | bf43344 | 2010-02-28 23:13:35 | [diff] [blame] | 66 | link:RelNotes-1.7.0.1.txt[1.7.0.1], |
Junio C Hamano | dca3482 | 2010-02-13 01:02:52 | [diff] [blame] | 67 | link:RelNotes-1.7.0.txt[1.7.0]. |
| 68 | |
Junio C Hamano | e7c7be3 | 2010-02-10 23:26:48 | [diff] [blame] | 69 | * link:v1.6.6.2/git.html[documentation for release 1.6.6.2] |
Junio C Hamano | f3a01ab | 2009-12-24 00:30:34 | [diff] [blame] | 70 | |
| 71 | * release notes for |
Junio C Hamano | e7c7be3 | 2010-02-10 23:26:48 | [diff] [blame] | 72 | link:RelNotes-1.6.6.2.txt[1.6.6.2], |
Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 73 | link:RelNotes-1.6.6.1.txt[1.6.6.1], |
Junio C Hamano | f3a01ab | 2009-12-24 00:30:34 | [diff] [blame] | 74 | link:RelNotes-1.6.6.txt[1.6.6]. |
| 75 | |
Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 76 | * link:v1.6.5.8/git.html[documentation for release 1.6.5.8] |
Junio C Hamano | 77e01e3 | 2009-10-11 01:57:34 | [diff] [blame] | 77 | |
| 78 | * release notes for |
Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 79 | link:RelNotes-1.6.5.8.txt[1.6.5.8], |
Junio C Hamano | 6a548ef | 2009-12-17 00:16:20 | [diff] [blame] | 80 | link:RelNotes-1.6.5.7.txt[1.6.5.7], |
Junio C Hamano | 9336277 | 2009-12-11 06:01:11 | [diff] [blame] | 81 | link:RelNotes-1.6.5.6.txt[1.6.5.6], |
Junio C Hamano | e5574b6 | 2009-12-06 04:04:45 | [diff] [blame] | 82 | link:RelNotes-1.6.5.5.txt[1.6.5.5], |
Junio C Hamano | fa2ad88 | 2009-12-03 09:15:44 | [diff] [blame] | 83 | link:RelNotes-1.6.5.4.txt[1.6.5.4], |
Junio C Hamano | e26ca7c | 2009-11-16 22:28:31 | [diff] [blame] | 84 | link:RelNotes-1.6.5.3.txt[1.6.5.3], |
Junio C Hamano | 621e123 | 2009-10-26 05:16:47 | [diff] [blame] | 85 | link:RelNotes-1.6.5.2.txt[1.6.5.2], |
Junio C Hamano | b71a22d | 2009-10-17 08:23:47 | [diff] [blame] | 86 | link:RelNotes-1.6.5.1.txt[1.6.5.1], |
Junio C Hamano | 77e01e3 | 2009-10-11 01:57:34 | [diff] [blame] | 87 | link:RelNotes-1.6.5.txt[1.6.5]. |
| 88 | |
Junio C Hamano | fb44f81 | 2009-09-17 00:40:17 | [diff] [blame] | 89 | * link:v1.6.4.4/git.html[documentation for release 1.6.4.4] |
Junio C Hamano | 3bd4ce3 | 2009-06-04 07:18:09 | [diff] [blame] | 90 | |
| 91 | * release notes for |
Junio C Hamano | fb44f81 | 2009-09-17 00:40:17 | [diff] [blame] | 92 | link:RelNotes-1.6.4.4.txt[1.6.4.4], |
Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 93 | link:RelNotes-1.6.4.3.txt[1.6.4.3], |
Junio C Hamano | 68cfa3a | 2009-08-30 00:22:55 | [diff] [blame] | 94 | link:RelNotes-1.6.4.2.txt[1.6.4.2], |
Junio C Hamano | fe24db0 | 2009-08-22 05:10:47 | [diff] [blame] | 95 | link:RelNotes-1.6.4.1.txt[1.6.4.1], |
Junio C Hamano | 543f8d6 | 2009-07-29 08:35:21 | [diff] [blame] | 96 | link:RelNotes-1.6.4.txt[1.6.4]. |
| 97 | |
| 98 | * link:v1.6.3.4/git.html[documentation for release 1.6.3.4] |
| 99 | |
| 100 | * release notes for |
| 101 | link:RelNotes-1.6.3.4.txt[1.6.3.4], |
Junio C Hamano | d848f83 | 2009-06-22 08:15:12 | [diff] [blame] | 102 | link:RelNotes-1.6.3.3.txt[1.6.3.3], |
Junio C Hamano | 3bd4ce3 | 2009-06-04 07:18:09 | [diff] [blame] | 103 | link:RelNotes-1.6.3.2.txt[1.6.3.2], |
| 104 | link:RelNotes-1.6.3.1.txt[1.6.3.1], |
| 105 | link:RelNotes-1.6.3.txt[1.6.3]. |
Junio C Hamano | a9eca4e | 2009-03-04 08:29:59 | [diff] [blame] | 106 | |
| 107 | * release notes for |
Junio C Hamano | bde411d | 2009-05-07 05:07:31 | [diff] [blame] | 108 | link:RelNotes-1.6.2.5.txt[1.6.2.5], |
| 109 | link:RelNotes-1.6.2.4.txt[1.6.2.4], |
Junio C Hamano | 98e32c3 | 2009-04-13 02:39:53 | [diff] [blame] | 110 | link:RelNotes-1.6.2.3.txt[1.6.2.3], |
| 111 | link:RelNotes-1.6.2.2.txt[1.6.2.2], |
Junio C Hamano | 064b4ab | 2009-03-15 22:16:15 | [diff] [blame] | 112 | link:RelNotes-1.6.2.1.txt[1.6.2.1], |
Junio C Hamano | a9eca4e | 2009-03-04 08:29:59 | [diff] [blame] | 113 | link:RelNotes-1.6.2.txt[1.6.2]. |
| 114 | |
Junio C Hamano | e5bf6c1 | 2009-02-07 21:43:10 | [diff] [blame] | 115 | * link:v1.6.1.3/git.html[documentation for release 1.6.1.3] |
Junio C Hamano | 13016de | 2008-12-25 05:46:57 | [diff] [blame] | 116 | |
| 117 | * release notes for |
Junio C Hamano | e5bf6c1 | 2009-02-07 21:43:10 | [diff] [blame] | 118 | link:RelNotes-1.6.1.3.txt[1.6.1.3], |
| 119 | link:RelNotes-1.6.1.2.txt[1.6.1.2], |
Junio C Hamano | 20d47e3 | 2009-01-26 06:36:02 | [diff] [blame] | 120 | link:RelNotes-1.6.1.1.txt[1.6.1.1], |
Junio C Hamano | 13016de | 2008-12-25 05:46:57 | [diff] [blame] | 121 | link:RelNotes-1.6.1.txt[1.6.1]. |
| 122 | |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 123 | * link:v1.6.0.6/git.html[documentation for release 1.6.0.6] |
Junio C Hamano | c6e5950 | 2008-08-17 21:05:51 | [diff] [blame] | 124 | |
| 125 | * release notes for |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 126 | link:RelNotes-1.6.0.6.txt[1.6.0.6], |
Junio C Hamano | b402886 | 2008-12-08 02:03:49 | [diff] [blame] | 127 | link:RelNotes-1.6.0.5.txt[1.6.0.5], |
Junio C Hamano | 9bd39c4 | 2008-11-13 01:54:44 | [diff] [blame] | 128 | link:RelNotes-1.6.0.4.txt[1.6.0.4], |
| 129 | link:RelNotes-1.6.0.3.txt[1.6.0.3], |
Junio C Hamano | 675570c | 2008-09-13 06:07:28 | [diff] [blame] | 130 | link:RelNotes-1.6.0.2.txt[1.6.0.2], |
| 131 | link:RelNotes-1.6.0.1.txt[1.6.0.1], |
Junio C Hamano | c6e5950 | 2008-08-17 21:05:51 | [diff] [blame] | 132 | link:RelNotes-1.6.0.txt[1.6.0]. |
| 133 | |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 134 | * link:v1.5.6.6/git.html[documentation for release 1.5.6.6] |
Junio C Hamano | 11fe55c | 2008-06-18 23:14:56 | [diff] [blame] | 135 | |
| 136 | * release notes for |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 137 | link:RelNotes-1.5.6.6.txt[1.5.6.6], |
Junio C Hamano | b53db3c | 2008-08-07 00:17:52 | [diff] [blame] | 138 | link:RelNotes-1.5.6.5.txt[1.5.6.5], |
Junio C Hamano | 915cd9b | 2008-07-20 01:24:17 | [diff] [blame] | 139 | link:RelNotes-1.5.6.4.txt[1.5.6.4], |
| 140 | link:RelNotes-1.5.6.3.txt[1.5.6.3], |
| 141 | link:RelNotes-1.5.6.2.txt[1.5.6.2], |
| 142 | link:RelNotes-1.5.6.1.txt[1.5.6.1], |
Junio C Hamano | 9eb5753 | 2008-06-26 06:33:46 | [diff] [blame] | 143 | link:RelNotes-1.5.6.txt[1.5.6]. |
Junio C Hamano | 11fe55c | 2008-06-18 23:14:56 | [diff] [blame] | 144 | |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 145 | * link:v1.5.5.6/git.html[documentation for release 1.5.5.6] |
Junio C Hamano | 0d0679d | 2008-04-08 06:15:46 | [diff] [blame] | 146 | |
| 147 | * release notes for |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 148 | link:RelNotes-1.5.5.6.txt[1.5.5.6], |
| 149 | link:RelNotes-1.5.5.5.txt[1.5.5.5], |
Junio C Hamano | e2b205c | 2008-06-08 01:43:44 | [diff] [blame] | 150 | link:RelNotes-1.5.5.4.txt[1.5.5.4], |
Junio C Hamano | 99b28f2 | 2008-05-28 08:07:26 | [diff] [blame] | 151 | link:RelNotes-1.5.5.3.txt[1.5.5.3], |
Junio C Hamano | b7a77fa | 2008-05-26 07:20:01 | [diff] [blame] | 152 | link:RelNotes-1.5.5.2.txt[1.5.5.2], |
Junio C Hamano | e3ddb5b | 2008-04-21 00:48:07 | [diff] [blame] | 153 | link:RelNotes-1.5.5.1.txt[1.5.5.1], |
Junio C Hamano | 0d0679d | 2008-04-08 06:15:46 | [diff] [blame] | 154 | link:RelNotes-1.5.5.txt[1.5.5]. |
| 155 | |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 156 | * link:v1.5.4.7/git.html[documentation for release 1.5.4.7] |
Junio C Hamano | 7b9b426 | 2008-02-02 06:48:39 | [diff] [blame] | 157 | |
| 158 | * release notes for |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 159 | link:RelNotes-1.5.4.7.txt[1.5.4.7], |
| 160 | link:RelNotes-1.5.4.6.txt[1.5.4.6], |
Junio C Hamano | 56033be | 2008-03-28 06:12:53 | [diff] [blame] | 161 | link:RelNotes-1.5.4.5.txt[1.5.4.5], |
Junio C Hamano | bb34317 | 2008-03-09 10:39:09 | [diff] [blame] | 162 | link:RelNotes-1.5.4.4.txt[1.5.4.4], |
Junio C Hamano | cb174dd | 2008-02-23 21:03:54 | [diff] [blame] | 163 | link:RelNotes-1.5.4.3.txt[1.5.4.3], |
Junio C Hamano | e670d0d | 2008-02-17 20:14:59 | [diff] [blame] | 164 | link:RelNotes-1.5.4.2.txt[1.5.4.2], |
Junio C Hamano | efe3c63 | 2008-02-14 00:51:31 | [diff] [blame] | 165 | link:RelNotes-1.5.4.1.txt[1.5.4.1], |
Junio C Hamano | 7b9b426 | 2008-02-02 06:48:39 | [diff] [blame] | 166 | link:RelNotes-1.5.4.txt[1.5.4]. |
| 167 | |
Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 168 | * link:v1.5.3.8/git.html[documentation for release 1.5.3.8] |
Junio C Hamano | a75069c | 2007-09-04 01:19:24 | [diff] [blame] | 169 | |
| 170 | * release notes for |
Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 171 | link:RelNotes-1.5.3.8.txt[1.5.3.8], |
Junio C Hamano | 976c0c4 | 2007-12-01 21:57:14 | [diff] [blame] | 172 | link:RelNotes-1.5.3.7.txt[1.5.3.7], |
Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 173 | link:RelNotes-1.5.3.6.txt[1.5.3.6], |
Junio C Hamano | 1c70883 | 2007-11-02 02:47:50 | [diff] [blame] | 174 | link:RelNotes-1.5.3.5.txt[1.5.3.5], |
Junio C Hamano | ea719cf | 2007-10-04 13:06:35 | [diff] [blame] | 175 | link:RelNotes-1.5.3.4.txt[1.5.3.4], |
Junio C Hamano | 58992c9 | 2007-10-01 16:23:18 | [diff] [blame] | 176 | link:RelNotes-1.5.3.3.txt[1.5.3.3], |
Junio C Hamano | 199cdf1 | 2007-09-19 18:30:47 | [diff] [blame] | 177 | link:RelNotes-1.5.3.2.txt[1.5.3.2], |
Junio C Hamano | 61210dd | 2007-10-24 11:52:13 | [diff] [blame] | 178 | link:RelNotes-1.5.3.1.txt[1.5.3.1], |
| 179 | link:RelNotes-1.5.3.txt[1.5.3]. |
Junio C Hamano | 75485c8 | 2007-05-19 04:20:33 | [diff] [blame] | 180 | |
Junio C Hamano | 9eb5753 | 2008-06-26 06:33:46 | [diff] [blame] | 181 | * link:v1.5.2.5/git.html[documentation for release 1.5.2.5] |
| 182 | |
Junio C Hamano | ed7f4f6 | 2007-05-20 09:09:09 | [diff] [blame] | 183 | * release notes for |
Junio C Hamano | 3b178be | 2007-08-16 04:59:27 | [diff] [blame] | 184 | link:RelNotes-1.5.2.5.txt[1.5.2.5], |
Junio C Hamano | 235d53f | 2007-07-13 00:25:15 | [diff] [blame] | 185 | link:RelNotes-1.5.2.4.txt[1.5.2.4], |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 186 | link:RelNotes-1.5.2.3.txt[1.5.2.3], |
Junio C Hamano | 29b1b92 | 2007-06-16 16:30:26 | [diff] [blame] | 187 | link:RelNotes-1.5.2.2.txt[1.5.2.2], |
| 188 | link:RelNotes-1.5.2.1.txt[1.5.2.1], |
Junio C Hamano | ed7f4f6 | 2007-05-20 09:09:09 | [diff] [blame] | 189 | link:RelNotes-1.5.2.txt[1.5.2]. |
| 190 | |
| 191 | * link:v1.5.1.6/git.html[documentation for release 1.5.1.6] |
| 192 | |
| 193 | * release notes for |
| 194 | link:RelNotes-1.5.1.6.txt[1.5.1.6], |
| 195 | link:RelNotes-1.5.1.5.txt[1.5.1.5], |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 196 | link:RelNotes-1.5.1.4.txt[1.5.1.4], |
| 197 | link:RelNotes-1.5.1.3.txt[1.5.1.3], |
| 198 | link:RelNotes-1.5.1.2.txt[1.5.1.2], |
| 199 | link:RelNotes-1.5.1.1.txt[1.5.1.1], |
| 200 | link:RelNotes-1.5.1.txt[1.5.1]. |
Junio C Hamano | 91d44c5 | 2007-05-09 07:16:07 | [diff] [blame] | 201 | |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 202 | * link:v1.5.0.7/git.html[documentation for release 1.5.0.7] |
Junio C Hamano | 91d44c5 | 2007-05-09 07:16:07 | [diff] [blame] | 203 | |
Junio C Hamano | ed7f4f6 | 2007-05-20 09:09:09 | [diff] [blame] | 204 | * release notes for |
| 205 | link:RelNotes-1.5.0.7.txt[1.5.0.7], |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 206 | link:RelNotes-1.5.0.6.txt[1.5.0.6], |
| 207 | link:RelNotes-1.5.0.5.txt[1.5.0.5], |
| 208 | link:RelNotes-1.5.0.3.txt[1.5.0.3], |
| 209 | link:RelNotes-1.5.0.2.txt[1.5.0.2], |
| 210 | link:RelNotes-1.5.0.1.txt[1.5.0.1], |
| 211 | link:RelNotes-1.5.0.txt[1.5.0]. |
Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 212 | |
Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 213 | * documentation for release link:v1.4.4.4/git.html[1.4.4.4], |
| 214 | link:v1.3.3/git.html[1.3.3], |
| 215 | link:v1.2.6/git.html[1.2.6], |
| 216 | link:v1.0.13/git.html[1.0.13]. |
Junio C Hamano | 9d52e57 | 2007-02-13 23:48:20 | [diff] [blame] | 217 | |
| 218 | ============ |
| 219 | |
| 220 | endif::stalenotes[] |
| 221 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 222 | OPTIONS |
| 223 | ------- |
| 224 | --version:: |
Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 225 | Prints the git suite version that the 'git' program came from. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 226 | |
| 227 | --help:: |
Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 228 | Prints the synopsis and a list of the most commonly used |
Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 229 | commands. If the option '--all' or '-a' is given then all |
| 230 | available commands are printed. If a git command is named this |
| 231 | option will bring up the manual page for that command. |
Junio C Hamano | 0c0da5f | 2007-12-13 02:45:30 | [diff] [blame] | 232 | + |
| 233 | Other options are available to control how the manual page is |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 234 | displayed. See linkgit:git-help[1] for more information, |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 235 | because `git --help ...` is converted internally into `git |
| 236 | help ...`. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 237 | |
Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 238 | -c <name>=<value>:: |
| 239 | Pass a configuration parameter to the command. The value |
| 240 | given will override values from configuration files. |
| 241 | The <name> is expected in the same format as listed by |
| 242 | 'git config' (subkeys separated by dots). |
| 243 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 244 | --exec-path:: |
Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 245 | Path to wherever your core git programs are installed. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 246 | This can also be controlled by setting the GIT_EXEC_PATH |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 247 | environment variable. If no path is given, 'git' will print |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 248 | the current setting and then exit. |
| 249 | |
Junio C Hamano | b4a9ede | 2009-04-08 07:36:32 | [diff] [blame] | 250 | --html-path:: |
| 251 | Print the path to wherever your git HTML documentation is installed |
| 252 | and exit. |
| 253 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 254 | -p:: |
| 255 | --paginate:: |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 256 | Pipe all output into 'less' (or if set, $PAGER) if standard |
| 257 | output is a terminal. This overrides the `pager.<cmd>` |
| 258 | configuration options (see the "Configuration Mechanism" section |
| 259 | below). |
Junio C Hamano | f870ef8 | 2006-07-29 09:10:13 | [diff] [blame] | 260 | |
Junio C Hamano | cae8627 | 2007-08-21 02:20:49 | [diff] [blame] | 261 | --no-pager:: |
| 262 | Do not pipe git output into a pager. |
| 263 | |
Junio C Hamano | f870ef8 | 2006-07-29 09:10:13 | [diff] [blame] | 264 | --git-dir=<path>:: |
| 265 | Set the path to the repository. This can also be controlled by |
Junio C Hamano | 7d575a5 | 2008-04-30 08:45:27 | [diff] [blame] | 266 | setting the GIT_DIR environment variable. It can be an absolute |
| 267 | path or relative path to current working directory. |
Junio C Hamano | f870ef8 | 2006-07-29 09:10:13 | [diff] [blame] | 268 | |
Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 269 | --work-tree=<path>:: |
| 270 | Set the path to the working tree. The value will not be |
| 271 | used in combination with repositories found automatically in |
| 272 | a .git directory (i.e. $GIT_DIR is not set). |
| 273 | This can also be controlled by setting the GIT_WORK_TREE |
| 274 | environment variable and the core.worktree configuration |
Junio C Hamano | 7d575a5 | 2008-04-30 08:45:27 | [diff] [blame] | 275 | variable. It can be an absolute path or relative path to |
| 276 | the directory specified by --git-dir or GIT_DIR. |
| 277 | Note: If --git-dir or GIT_DIR are specified but none of |
| 278 | --work-tree, GIT_WORK_TREE and core.worktree is specified, |
| 279 | the current working directory is regarded as the top directory |
| 280 | of your working tree. |
Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 281 | |
Junio C Hamano | f870ef8 | 2006-07-29 09:10:13 | [diff] [blame] | 282 | --bare:: |
Junio C Hamano | c435b1c | 2007-08-28 06:25:35 | [diff] [blame] | 283 | Treat the repository as a bare repository. If GIT_DIR |
| 284 | environment is not set, it is set to the current working |
| 285 | directory. |
| 286 | |
Junio C Hamano | 3d23a0a | 2009-10-19 08:04:30 | [diff] [blame] | 287 | --no-replace-objects:: |
| 288 | Do not use replacement refs to replace git objects. See |
| 289 | linkgit:git-replace[1] for more information. |
| 290 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 291 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 292 | FURTHER DOCUMENTATION |
| 293 | --------------------- |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 294 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 295 | See the references above to get started using git. The following is |
| 296 | probably more detail than necessary for a first-time user. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 297 | |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 298 | The link:user-manual.html#git-concepts[git concepts chapter of the |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 299 | user-manual] and linkgit:gitcore-tutorial[7] both provide |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 300 | introductions to the underlying git architecture. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 301 | |
Junio C Hamano | 804b521 | 2009-06-07 16:05:03 | [diff] [blame] | 302 | See linkgit:gitworkflows[7] for an overview of recommended workflows. |
| 303 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 304 | See also the link:howto-index.html[howto] documents for some useful |
| 305 | examples. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 306 | |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 307 | The internals are documented in the |
| 308 | link:technical/api-index.html[GIT API documentation]. |
Junio C Hamano | 3dac504 | 2007-12-15 08:40:54 | [diff] [blame] | 309 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 310 | GIT COMMANDS |
| 311 | ------------ |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 312 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 313 | We divide git into high level ("porcelain") commands and low level |
| 314 | ("plumbing") commands. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 315 | |
Junio C Hamano | b19b4f0 | 2006-10-29 20:47:22 | [diff] [blame] | 316 | High-level commands (porcelain) |
| 317 | ------------------------------- |
| 318 | |
| 319 | We separate the porcelain commands into the main commands and some |
| 320 | ancillary user utilities. |
| 321 | |
| 322 | Main porcelain commands |
| 323 | ~~~~~~~~~~~~~~~~~~~~~~~ |
| 324 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 325 | include::cmds-mainporcelain.txt[] |
Junio C Hamano | b19b4f0 | 2006-10-29 20:47:22 | [diff] [blame] | 326 | |
| 327 | Ancillary Commands |
| 328 | ~~~~~~~~~~~~~~~~~~ |
| 329 | Manipulators: |
| 330 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 331 | include::cmds-ancillarymanipulators.txt[] |
Junio C Hamano | b19b4f0 | 2006-10-29 20:47:22 | [diff] [blame] | 332 | |
| 333 | Interrogators: |
| 334 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 335 | include::cmds-ancillaryinterrogators.txt[] |
Junio C Hamano | b19b4f0 | 2006-10-29 20:47:22 | [diff] [blame] | 336 | |
Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 337 | |
| 338 | Interacting with Others |
| 339 | ~~~~~~~~~~~~~~~~~~~~~~~ |
| 340 | |
| 341 | These commands are to interact with foreign SCM and with other |
| 342 | people via patch over e-mail. |
| 343 | |
| 344 | include::cmds-foreignscminterface.txt[] |
| 345 | |
| 346 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 347 | Low-level commands (plumbing) |
| 348 | ----------------------------- |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 349 | |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 350 | Although git includes its |
| 351 | own porcelain layer, its low-level commands are sufficient to support |
| 352 | development of alternative porcelains. Developers of such porcelains |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 353 | might start by reading about linkgit:git-update-index[1] and |
| 354 | linkgit:git-read-tree[1]. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 355 | |
Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 356 | The interface (input, output, set of options and the semantics) |
| 357 | to these low-level commands are meant to be a lot more stable |
| 358 | than Porcelain level commands, because these commands are |
| 359 | primarily for scripted use. The interface to Porcelain commands |
| 360 | on the other hand are subject to change in order to improve the |
| 361 | end user experience. |
| 362 | |
| 363 | The following description divides |
| 364 | the low-level commands into commands that manipulate objects (in |
Junio C Hamano | e27fb93 | 2006-04-03 05:34:10 | [diff] [blame] | 365 | the repository, index, and working tree), commands that interrogate and |
| 366 | compare objects, and commands that move objects and references between |
| 367 | repositories. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 368 | |
Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 369 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 370 | Manipulation commands |
| 371 | ~~~~~~~~~~~~~~~~~~~~~ |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 372 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 373 | include::cmds-plumbingmanipulators.txt[] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 374 | |
| 375 | |
| 376 | Interrogation commands |
| 377 | ~~~~~~~~~~~~~~~~~~~~~~ |
| 378 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 379 | include::cmds-plumbinginterrogators.txt[] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 380 | |
| 381 | In general, the interrogate commands do not touch the files in |
| 382 | the working tree. |
| 383 | |
| 384 | |
| 385 | Synching repositories |
| 386 | ~~~~~~~~~~~~~~~~~~~~~ |
| 387 | |
Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame] | 388 | include::cmds-synchingrepositories.txt[] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 389 | |
Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 390 | The following are helper commands used by the above; end users |
Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 391 | typically do not use them directly. |
| 392 | |
| 393 | include::cmds-synchelpers.txt[] |
| 394 | |
| 395 | |
| 396 | Internal helper commands |
| 397 | ~~~~~~~~~~~~~~~~~~~~~~~~ |
| 398 | |
| 399 | These are internal helper commands used by other commands; end |
| 400 | users typically do not use them directly. |
| 401 | |
| 402 | include::cmds-purehelpers.txt[] |
| 403 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 404 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 405 | Configuration Mechanism |
| 406 | ----------------------- |
| 407 | |
| 408 | Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file |
| 409 | is used to hold per-repository configuration options. It is a |
Junio C Hamano | 51c2ab0 | 2006-07-09 20:38:54 | [diff] [blame] | 410 | simple text file modeled after `.ini` format familiar to some |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 411 | people. Here is an example: |
| 412 | |
| 413 | ------------ |
| 414 | # |
| 415 | # A '#' or ';' character indicates a comment. |
| 416 | # |
| 417 | |
| 418 | ; core variables |
| 419 | [core] |
| 420 | ; Don't trust file modes |
| 421 | filemode = false |
| 422 | |
| 423 | ; user identity |
| 424 | [user] |
| 425 | name = "Junio C Hamano" |
| 426 | email = "junkio@twinsun.com" |
| 427 | |
| 428 | ------------ |
| 429 | |
| 430 | Various commands read from the configuration file and adjust |
Junio C Hamano | 4aa0bcc | 2010-03-03 05:13:12 | [diff] [blame] | 431 | their operation accordingly. See linkgit:git-config[1] for a |
| 432 | list. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 433 | |
| 434 | |
| 435 | Identifier Terminology |
| 436 | ---------------------- |
| 437 | <object>:: |
| 438 | Indicates the object name for any type of object. |
| 439 | |
| 440 | <blob>:: |
| 441 | Indicates a blob object name. |
| 442 | |
| 443 | <tree>:: |
| 444 | Indicates a tree object name. |
| 445 | |
| 446 | <commit>:: |
| 447 | Indicates a commit object name. |
| 448 | |
| 449 | <tree-ish>:: |
| 450 | Indicates a tree, commit or tag object name. A |
| 451 | command that takes a <tree-ish> argument ultimately wants to |
| 452 | operate on a <tree> object but automatically dereferences |
| 453 | <commit> and <tag> objects that point at a <tree>. |
| 454 | |
Junio C Hamano | 60f8aa8 | 2007-03-06 09:58:26 | [diff] [blame] | 455 | <commit-ish>:: |
| 456 | Indicates a commit or tag object name. A |
| 457 | command that takes a <commit-ish> argument ultimately wants to |
| 458 | operate on a <commit> object but automatically dereferences |
| 459 | <tag> objects that point at a <commit>. |
| 460 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 461 | <type>:: |
| 462 | Indicates that an object type is required. |
| 463 | Currently one of: `blob`, `tree`, `commit`, or `tag`. |
| 464 | |
| 465 | <file>:: |
| 466 | Indicates a filename - almost always relative to the |
| 467 | root of the tree structure `GIT_INDEX_FILE` describes. |
| 468 | |
| 469 | Symbolic Identifiers |
| 470 | -------------------- |
| 471 | Any git command accepting any <object> can also use the following |
| 472 | symbolic notation: |
| 473 | |
| 474 | HEAD:: |
| 475 | indicates the head of the current branch (i.e. the |
| 476 | contents of `$GIT_DIR/HEAD`). |
| 477 | |
| 478 | <tag>:: |
| 479 | a valid tag 'name' |
| 480 | (i.e. the contents of `$GIT_DIR/refs/tags/<tag>`). |
| 481 | |
| 482 | <head>:: |
| 483 | a valid head 'name' |
| 484 | (i.e. the contents of `$GIT_DIR/refs/heads/<head>`). |
| 485 | |
Junio C Hamano | ff4b431 | 2006-10-25 22:55:31 | [diff] [blame] | 486 | For a more complete list of ways to spell object names, see |
Junio C Hamano | 78e3a78 | 2010-07-15 22:24:45 | [diff] [blame] | 487 | "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. |
Junio C Hamano | ff4b431 | 2006-10-25 22:55:31 | [diff] [blame] | 488 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 489 | |
| 490 | File/Directory Structure |
| 491 | ------------------------ |
| 492 | |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 493 | Please see the linkgit:gitrepository-layout[5] document. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 494 | |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 495 | Read linkgit:githooks[5] for more details about each hook. |
Junio C Hamano | 818f7d6 | 2006-03-26 01:49:30 | [diff] [blame] | 496 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 497 | Higher level SCMs may provide and manage additional information in the |
| 498 | `$GIT_DIR`. |
| 499 | |
| 500 | |
| 501 | Terminology |
| 502 | ----------- |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 503 | Please see linkgit:gitglossary[7]. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 504 | |
| 505 | |
| 506 | Environment Variables |
| 507 | --------------------- |
| 508 | Various git commands use the following environment variables: |
| 509 | |
| 510 | The git Repository |
| 511 | ~~~~~~~~~~~~~~~~~~ |
| 512 | These environment variables apply to 'all' core git commands. Nb: it |
| 513 | is worth noting that they may be used/overridden by SCMS sitting above |
| 514 | git so take care if using Cogito etc. |
| 515 | |
| 516 | 'GIT_INDEX_FILE':: |
| 517 | This environment allows the specification of an alternate |
| 518 | index file. If not specified, the default of `$GIT_DIR/index` |
| 519 | is used. |
| 520 | |
| 521 | 'GIT_OBJECT_DIRECTORY':: |
| 522 | If the object storage directory is specified via this |
| 523 | environment variable then the sha1 directories are created |
| 524 | underneath - otherwise the default `$GIT_DIR/objects` |
| 525 | directory is used. |
| 526 | |
| 527 | 'GIT_ALTERNATE_OBJECT_DIRECTORIES':: |
| 528 | Due to the immutable nature of git objects, old objects can be |
| 529 | archived into shared, read-only directories. This variable |
Junio C Hamano | 05bf9c5 | 2008-07-03 09:21:58 | [diff] [blame] | 530 | specifies a ":" separated (on Windows ";" separated) list |
| 531 | of git object directories which can be used to search for git |
| 532 | objects. New objects will not be written to these directories. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 533 | |
| 534 | 'GIT_DIR':: |
| 535 | If the 'GIT_DIR' environment variable is set then it |
| 536 | specifies a path to use instead of the default `.git` |
| 537 | for the base of the repository. |
| 538 | |
Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 539 | 'GIT_WORK_TREE':: |
| 540 | Set the path to the working tree. The value will not be |
| 541 | used in combination with repositories found automatically in |
| 542 | a .git directory (i.e. $GIT_DIR is not set). |
| 543 | This can also be controlled by the '--work-tree' command line |
| 544 | option and the core.worktree configuration variable. |
| 545 | |
Junio C Hamano | 1504827 | 2008-07-07 22:10:48 | [diff] [blame] | 546 | 'GIT_CEILING_DIRECTORIES':: |
| 547 | This should be a colon-separated list of absolute paths. |
| 548 | If set, it is a list of directories that git should not chdir |
| 549 | up into while looking for a repository directory. |
| 550 | It will not exclude the current working directory or |
| 551 | a GIT_DIR set on the command line or in the environment. |
| 552 | (Useful for excluding slow-loading network directories.) |
| 553 | |
Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 554 | 'GIT_DISCOVERY_ACROSS_FILESYSTEM':: |
| 555 | When run in a directory that does not have ".git" repository |
| 556 | directory, git tries to find such a directory in the parent |
| 557 | directories to find the top of the working tree, but by default it |
| 558 | does not cross filesystem boundaries. This environment variable |
| 559 | can be set to true to tell git not to stop at filesystem |
| 560 | boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect |
| 561 | an explicit repository directory set via 'GIT_DIR' or on the |
| 562 | command line. |
| 563 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 564 | git Commits |
| 565 | ~~~~~~~~~~~ |
| 566 | 'GIT_AUTHOR_NAME':: |
| 567 | 'GIT_AUTHOR_EMAIL':: |
| 568 | 'GIT_AUTHOR_DATE':: |
| 569 | 'GIT_COMMITTER_NAME':: |
| 570 | 'GIT_COMMITTER_EMAIL':: |
Junio C Hamano | 469d60e | 2007-04-29 18:30:34 | [diff] [blame] | 571 | 'GIT_COMMITTER_DATE':: |
| 572 | 'EMAIL':: |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 573 | see linkgit:git-commit-tree[1] |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 574 | |
| 575 | git Diffs |
| 576 | ~~~~~~~~~ |
| 577 | 'GIT_DIFF_OPTS':: |
Junio C Hamano | 1c43712 | 2006-11-28 02:22:25 | [diff] [blame] | 578 | Only valid setting is "--unified=??" or "-u??" to set the |
| 579 | number of context lines shown when a unified diff is created. |
| 580 | This takes precedence over any "-U" or "--unified" option |
| 581 | value passed on the git diff command line. |
| 582 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 583 | 'GIT_EXTERNAL_DIFF':: |
Junio C Hamano | 1c43712 | 2006-11-28 02:22:25 | [diff] [blame] | 584 | When the environment variable 'GIT_EXTERNAL_DIFF' is set, the |
| 585 | program named by it is called, instead of the diff invocation |
| 586 | described above. For a path that is added, removed, or modified, |
| 587 | 'GIT_EXTERNAL_DIFF' is called with 7 parameters: |
| 588 | |
| 589 | path old-file old-hex old-mode new-file new-hex new-mode |
| 590 | + |
| 591 | where: |
| 592 | |
| 593 | <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the |
| 594 | contents of <old|new>, |
| 595 | <old|new>-hex:: are the 40-hexdigit SHA1 hashes, |
| 596 | <old|new>-mode:: are the octal representation of the file modes. |
| 597 | |
| 598 | + |
| 599 | The file parameters can point at the user's working file |
| 600 | (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` |
| 601 | when a new file is added), or a temporary file (e.g. `old-file` in the |
| 602 | index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the |
| 603 | temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. |
| 604 | + |
| 605 | For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 |
| 606 | parameter, <path>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 607 | |
Junio C Hamano | 7ccb9fd | 2006-07-15 01:38:40 | [diff] [blame] | 608 | other |
| 609 | ~~~~~ |
Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 610 | 'GIT_MERGE_VERBOSITY':: |
| 611 | A number controlling the amount of output shown by |
| 612 | the recursive merge strategy. Overrides merge.verbosity. |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 613 | See linkgit:git-merge[1] |
Junio C Hamano | 1e6e006 | 2007-07-13 05:33:25 | [diff] [blame] | 614 | |
Junio C Hamano | 85e45fa | 2006-08-13 07:47:41 | [diff] [blame] | 615 | 'GIT_PAGER':: |
Junio C Hamano | f6002a9 | 2007-07-20 10:28:22 | [diff] [blame] | 616 | This environment variable overrides `$PAGER`. If it is set |
| 617 | to an empty string or to the value "cat", git will not launch |
Junio C Hamano | 0551f6a | 2008-08-25 00:33:33 | [diff] [blame] | 618 | a pager. See also the `core.pager` option in |
| 619 | linkgit:git-config[1]. |
Junio C Hamano | 85e45fa | 2006-08-13 07:47:41 | [diff] [blame] | 620 | |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 621 | 'GIT_SSH':: |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 622 | If this environment variable is set then 'git fetch' |
| 623 | and 'git push' will use this command instead |
Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 624 | of 'ssh' when they need to connect to a remote system. |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 625 | The '$GIT_SSH' command will be given exactly two arguments: |
Junio C Hamano | 4cd1c0e | 2007-08-06 04:39:14 | [diff] [blame] | 626 | the 'username@host' (or just 'host') from the URL and the |
| 627 | shell command to execute on that remote system. |
| 628 | + |
| 629 | To pass options to the program that you want to list in GIT_SSH |
| 630 | you will need to wrap the program and options into a shell script, |
| 631 | then set GIT_SSH to refer to the shell script. |
| 632 | + |
| 633 | Usually it is easier to configure any desired options through your |
| 634 | personal `.ssh/config` file. Please consult your ssh documentation |
| 635 | for further details. |
| 636 | |
Junio C Hamano | 401939f | 2007-07-01 06:34:30 | [diff] [blame] | 637 | 'GIT_FLUSH':: |
| 638 | If this environment variable is set to "1", then commands such |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 639 | as 'git blame' (in incremental mode), 'git rev-list', 'git log', |
| 640 | and 'git whatchanged' will force a flush of the output stream |
Junio C Hamano | 401939f | 2007-07-01 06:34:30 | [diff] [blame] | 641 | after each commit-oriented record have been flushed. If this |
| 642 | variable is set to "0", the output of these commands will be done |
| 643 | using completely buffered I/O. If this environment variable is |
| 644 | not set, git will choose buffered or record-oriented flushing |
| 645 | based on whether stdout appears to be redirected to a file or not. |
| 646 | |
Junio C Hamano | 7ccb9fd | 2006-07-15 01:38:40 | [diff] [blame] | 647 | 'GIT_TRACE':: |
Junio C Hamano | ef4b48b | 2006-09-04 10:08:34 | [diff] [blame] | 648 | If this variable is set to "1", "2" or "true" (comparison |
| 649 | is case insensitive), git will print `trace:` messages on |
Junio C Hamano | 7ccb9fd | 2006-07-15 01:38:40 | [diff] [blame] | 650 | stderr telling about alias expansion, built-in command |
| 651 | execution and external command execution. |
Junio C Hamano | ef4b48b | 2006-09-04 10:08:34 | [diff] [blame] | 652 | If this variable is set to an integer value greater than 1 |
| 653 | and lower than 10 (strictly) then git will interpret this |
| 654 | value as an open file descriptor and will try to write the |
| 655 | trace messages into this file descriptor. |
| 656 | Alternatively, if this variable is set to an absolute path |
| 657 | (starting with a '/' character), git will interpret this |
| 658 | as a file path and will try to write the trace messages |
| 659 | into it. |
Junio C Hamano | 7ccb9fd | 2006-07-15 01:38:40 | [diff] [blame] | 660 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 661 | Discussion[[Discussion]] |
| 662 | ------------------------ |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 663 | |
| 664 | More detail on the following is available from the |
| 665 | link:user-manual.html#git-concepts[git concepts chapter of the |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 666 | user-manual] and linkgit:gitcore-tutorial[7]. |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 667 | |
| 668 | A git project normally consists of a working directory with a ".git" |
| 669 | subdirectory at the top level. The .git directory contains, among other |
| 670 | things, a compressed object database representing the complete history |
| 671 | of the project, an "index" file which links that history to the current |
| 672 | contents of the working tree, and named pointers into that history such |
| 673 | as tags and branch heads. |
| 674 | |
| 675 | The object database contains objects of three main types: blobs, which |
| 676 | hold file data; trees, which point to blobs and other trees to build up |
Junio C Hamano | fe98605 | 2007-12-19 07:33:38 | [diff] [blame] | 677 | directory hierarchies; and commits, which each reference a single tree |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 678 | and some number of parent commits. |
| 679 | |
| 680 | The commit, equivalent to what other systems call a "changeset" or |
| 681 | "version", represents a step in the project's history, and each parent |
| 682 | represents an immediately preceding step. Commits with more than one |
| 683 | parent represent merges of independent lines of development. |
| 684 | |
| 685 | All objects are named by the SHA1 hash of their contents, normally |
| 686 | written as a string of 40 hex digits. Such names are globally unique. |
| 687 | The entire history leading up to a commit can be vouched for by signing |
| 688 | just that commit. A fourth object type, the tag, is provided for this |
| 689 | purpose. |
| 690 | |
| 691 | When first created, objects are stored in individual files, but for |
| 692 | efficiency may later be compressed together into "pack files". |
| 693 | |
| 694 | Named pointers called refs mark interesting points in history. A ref |
| 695 | may contain the SHA1 name of an object or the name of another ref. Refs |
| 696 | with names beginning `ref/head/` contain the SHA1 name of the most |
Junio C Hamano | fe98605 | 2007-12-19 07:33:38 | [diff] [blame] | 697 | recent commit (or "head") of a branch under development. SHA1 names of |
Junio C Hamano | 597ffcf | 2007-09-17 17:33:15 | [diff] [blame] | 698 | tags of interest are stored under `ref/tags/`. A special ref named |
| 699 | `HEAD` contains the name of the currently checked-out branch. |
| 700 | |
| 701 | The index file is initialized with a list of all paths and, for each |
| 702 | path, a blob object and a set of attributes. The blob object represents |
| 703 | the contents of the file as of the head of the current branch. The |
| 704 | attributes (last modified time, size, etc.) are taken from the |
| 705 | corresponding file in the working tree. Subsequent changes to the |
| 706 | working tree can be found by comparing these attributes. The index may |
| 707 | be updated with new content, and new commits may be created from the |
| 708 | content stored in the index. |
| 709 | |
| 710 | The index is also capable of storing multiple entries (called "stages") |
| 711 | for a given pathname. These stages are used to hold the various |
| 712 | unmerged version of a file when a merge is in progress. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 713 | |
| 714 | Authors |
| 715 | ------- |
| 716 | * git's founding father is Linus Torvalds <torvalds@osdl.org>. |
Junio C Hamano | dbb6459 | 2007-09-01 11:17:39 | [diff] [blame] | 717 | * The current git nurse is Junio C Hamano <gitster@pobox.com>. |
Junio C Hamano | e0facb9 | 2007-12-05 10:59:48 | [diff] [blame] | 718 | * The git potty was written by Andreas Ericsson <ae@op5.se>. |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 719 | * General upbringing is handled by the git-list <git@vger.kernel.org>. |
| 720 | |
| 721 | Documentation |
| 722 | -------------- |
| 723 | The documentation for git suite was started by David Greaves |
| 724 | <david@dgreaves.com>, and later enhanced greatly by the |
| 725 | contributors on the git-list <git@vger.kernel.org>. |
| 726 | |
Junio C Hamano | 9e1793f | 2008-06-02 07:31:16 | [diff] [blame] | 727 | SEE ALSO |
| 728 | -------- |
| 729 | linkgit:gittutorial[7], linkgit:gittutorial-2[7], |
Junio C Hamano | af1987f | 2008-08-03 07:58:19 | [diff] [blame] | 730 | link:everyday.html[Everyday Git], linkgit:gitcvs-migration[7], |
Junio C Hamano | 9e1793f | 2008-06-02 07:31:16 | [diff] [blame] | 731 | linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], |
Junio C Hamano | 804b521 | 2009-06-07 16:05:03 | [diff] [blame] | 732 | linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], |
| 733 | linkgit:gitworkflows[7] |
Junio C Hamano | 9e1793f | 2008-06-02 07:31:16 | [diff] [blame] | 734 | |
Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 735 | GIT |
| 736 | --- |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 737 | Part of the linkgit:git[1] suite |