| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-rev-parse(1) |
| 2 | ================ |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 6 | git-rev-parse - Pick out and massage parameters |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | 'git-rev-parse' [ --option ] <args>... |
| 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
| 15 | |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 16 | Many git porcelainish commands take mixture of flags |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 17 | (i.e. parameters that begin with a dash '-') and parameters |
| 18 | meant for underlying `git-rev-list` command they use internally |
| 19 | and flags and parameters for other commands they use as the |
| 20 | downstream of `git-rev-list`. This command is used to |
| 21 | distinguish between them. |
| 22 | |
| 23 | |
| 24 | OPTIONS |
| 25 | ------- |
| Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 26 | --parseopt:: |
| 27 | Use `git-rev-parse` in option parsing mode (see PARSEOPT section below). |
| 28 | |
| 29 | --keep-dash-dash:: |
| 30 | Only meaningful in `--parseopt` mode. Tells the option parser to echo |
| 31 | out the first `--` met instead of skipping it. |
| 32 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 33 | --revs-only:: |
| 34 | Do not output flags and parameters not meant for |
| 35 | `git-rev-list` command. |
| 36 | |
| 37 | --no-revs:: |
| 38 | Do not output flags and parameters meant for |
| 39 | `git-rev-list` command. |
| 40 | |
| 41 | --flags:: |
| 42 | Do not output non-flag parameters. |
| 43 | |
| 44 | --no-flags:: |
| 45 | Do not output flag parameters. |
| 46 | |
| 47 | --default <arg>:: |
| 48 | If there is no parameter given by the user, use `<arg>` |
| 49 | instead. |
| 50 | |
| 51 | --verify:: |
| 52 | The parameter given must be usable as a single, valid |
| 53 | object name. Otherwise barf and abort. |
| 54 | |
| 55 | --sq:: |
| 56 | Usually the output is made one line per flag and |
| 57 | parameter. This option makes output a single line, |
| 58 | properly quoted for consumption by shell. Useful when |
| 59 | you expect your parameter to contain whitespaces and |
| 60 | newlines (e.g. when using pickaxe `-S` with |
| 61 | `git-diff-\*`). |
| 62 | |
| 63 | --not:: |
| 64 | When showing object names, prefix them with '{caret}' and |
| 65 | strip '{caret}' prefix from the object names that already have |
| 66 | one. |
| 67 | |
| 68 | --symbolic:: |
| 69 | Usually the object names are output in SHA1 form (with |
| 70 | possible '{caret}' prefix); this option makes them output in a |
| 71 | form as close to the original input as possible. |
| 72 | |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 73 | --symbolic-full-name:: |
| 74 | This is similar to \--symbolic, but it omits input that |
| 75 | are not refs (i.e. branch or tag names; or more |
| 76 | explicitly disambiguating "heads/master" form, when you |
| 77 | want to name the "master" branch when there is an |
| 78 | unfortunately named tag "master"), and show them as full |
| 79 | refnames (e.g. "refs/heads/master"). |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 80 | |
| 81 | --all:: |
| 82 | Show all refs found in `$GIT_DIR/refs`. |
| 83 | |
| Junio C Hamano | 6959c6c | 2006-05-17 10:34:11 | [diff] [blame] | 84 | --branches:: |
| 85 | Show branch refs found in `$GIT_DIR/refs/heads`. |
| 86 | |
| 87 | --tags:: |
| 88 | Show tag refs found in `$GIT_DIR/refs/tags`. |
| 89 | |
| 90 | --remotes:: |
| 91 | Show tag refs found in `$GIT_DIR/refs/remotes`. |
| 92 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 93 | --show-prefix:: |
| 94 | When the command is invoked from a subdirectory, show the |
| 95 | path of the current directory relative to the top-level |
| 96 | directory. |
| 97 | |
| 98 | --show-cdup:: |
| 99 | When the command is invoked from a subdirectory, show the |
| 100 | path of the top-level directory relative to the current |
| 101 | directory (typically a sequence of "../", or an empty string). |
| 102 | |
| Junio C Hamano | e246e3b | 2006-02-19 08:45:18 | [diff] [blame] | 103 | --git-dir:: |
| 104 | Show `$GIT_DIR` if defined else show the path to the .git directory. |
| 105 | |
| Junio C Hamano | ee695f2 | 2007-06-21 00:35:36 | [diff] [blame] | 106 | --is-inside-git-dir:: |
| Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 107 | When the current working directory is below the repository |
| 108 | directory print "true", otherwise "false". |
| 109 | |
| 110 | --is-inside-work-tree:: |
| 111 | When the current working directory is inside the work tree of the |
| 112 | repository print "true", otherwise "false". |
| 113 | |
| 114 | --is-bare-repository:: |
| 115 | When the repository is bare print "true", otherwise "false". |
| Junio C Hamano | ee695f2 | 2007-06-21 00:35:36 | [diff] [blame] | 116 | |
| Junio C Hamano | db8c6ec | 2006-02-20 07:40:06 | [diff] [blame] | 117 | --short, --short=number:: |
| Junio C Hamano | e246e3b | 2006-02-19 08:45:18 | [diff] [blame] | 118 | Instead of outputting the full SHA1 values of object names try to |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 119 | abbreviate them to a shorter unique name. When no length is specified |
| Junio C Hamano | e246e3b | 2006-02-19 08:45:18 | [diff] [blame] | 120 | 7 is used. The minimum length is 4. |
| 121 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 122 | --since=datestring, --after=datestring:: |
| 123 | Parses the date string, and outputs corresponding |
| 124 | --max-age= parameter for git-rev-list command. |
| 125 | |
| 126 | --until=datestring, --before=datestring:: |
| 127 | Parses the date string, and outputs corresponding |
| 128 | --min-age= parameter for git-rev-list command. |
| 129 | |
| 130 | <args>...:: |
| 131 | Flags and parameters to be parsed. |
| 132 | |
| 133 | |
| 134 | SPECIFYING REVISIONS |
| 135 | -------------------- |
| 136 | |
| 137 | A revision parameter typically, but not necessarily, names a |
| 138 | commit object. They use what is called an 'extended SHA1' |
| Junio C Hamano | fbe0052 | 2006-10-19 05:58:48 | [diff] [blame] | 139 | syntax. Here are various ways to spell object names. The |
| 140 | ones listed near the end of this list are to name trees and |
| 141 | blobs contained in a commit. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 142 | |
| 143 | * The full SHA1 object name (40-byte hexadecimal string), or |
| 144 | a substring of such that is unique within the repository. |
| 145 | E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both |
| 146 | name the same commit object if there are no other object in |
| 147 | your repository whose object name starts with dae86e. |
| 148 | |
| Junio C Hamano | fbe0052 | 2006-10-19 05:58:48 | [diff] [blame] | 149 | * An output from `git-describe`; i.e. a closest tag, followed by a |
| Junio C Hamano | 29f1431 | 2006-10-26 08:47:29 | [diff] [blame] | 150 | dash, a `g`, and an abbreviated object name. |
| Junio C Hamano | fbe0052 | 2006-10-19 05:58:48 | [diff] [blame] | 151 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 152 | * A symbolic ref name. E.g. 'master' typically means the commit |
| 153 | object referenced by $GIT_DIR/refs/heads/master. If you |
| 154 | happen to have both heads/master and tags/master, you can |
| 155 | explicitly say 'heads/master' to tell git which one you mean. |
| Junio C Hamano | 29f1431 | 2006-10-26 08:47:29 | [diff] [blame] | 156 | When ambiguous, a `<name>` is disambiguated by taking the |
| 157 | first match in the following rules: |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 158 | |
| Junio C Hamano | 29f1431 | 2006-10-26 08:47:29 | [diff] [blame] | 159 | . if `$GIT_DIR/<name>` exists, that is what you mean (this is usually |
| 160 | useful only for `HEAD`, `FETCH_HEAD` and `MERGE_HEAD`); |
| 161 | |
| 162 | . otherwise, `$GIT_DIR/refs/<name>` if exists; |
| 163 | |
| 164 | . otherwise, `$GIT_DIR/refs/tags/<name>` if exists; |
| 165 | |
| 166 | . otherwise, `$GIT_DIR/refs/heads/<name>` if exists; |
| 167 | |
| 168 | . otherwise, `$GIT_DIR/refs/remotes/<name>` if exists; |
| 169 | |
| 170 | . otherwise, `$GIT_DIR/refs/remotes/<name>/HEAD` if exists. |
| 171 | |
| 172 | * A ref followed by the suffix '@' with a date specification |
| 173 | enclosed in a brace |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 174 | pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1 |
| 175 | second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value |
| 176 | of the ref at a prior point in time. This suffix may only be |
| 177 | used immediately following a ref name and the ref must have an |
| 178 | existing log ($GIT_DIR/logs/<ref>). |
| 179 | |
| Junio C Hamano | 2d47c62 | 2007-01-18 06:24:10 | [diff] [blame] | 180 | * A ref followed by the suffix '@' with an ordinal specification |
| 181 | enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify |
| 182 | the n-th prior value of that ref. For example 'master@\{1\}' |
| 183 | is the immediate prior value of 'master' while 'master@\{5\}' |
| 184 | is the 5th prior value of 'master'. This suffix may only be used |
| 185 | immediately following a ref name and the ref must have an existing |
| 186 | log ($GIT_DIR/logs/<ref>). |
| 187 | |
| Junio C Hamano | 39381a7 | 2007-02-02 07:35:15 | [diff] [blame] | 188 | * You can use the '@' construct with an empty ref part to get at a |
| 189 | reflog of the current branch. For example, if you are on the |
| 190 | branch 'blabla', then '@\{1\}' means the same as 'blabla@\{1\}'. |
| 191 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 192 | * A suffix '{caret}' to a revision parameter means the first parent of |
| 193 | that commit object. '{caret}<n>' means the <n>th parent (i.e. |
| 194 | 'rev{caret}' |
| 195 | is equivalent to 'rev{caret}1'). As a special rule, |
| 196 | 'rev{caret}0' means the commit itself and is used when 'rev' is the |
| 197 | object name of a tag object that refers to a commit object. |
| 198 | |
| Junio C Hamano | d97409f | 2006-10-03 08:41:56 | [diff] [blame] | 199 | * A suffix '{tilde}<n>' to a revision parameter means the commit |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 200 | object that is the <n>th generation grand-parent of the named |
| 201 | commit object, following only the first parent. I.e. rev~3 is |
| Junio C Hamano | 29f1431 | 2006-10-26 08:47:29 | [diff] [blame] | 202 | equivalent to rev{caret}{caret}{caret} which is equivalent to |
| 203 | rev{caret}1{caret}1{caret}1. See below for a illustration of |
| 204 | the usage of this form. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 205 | |
| 206 | * A suffix '{caret}' followed by an object type name enclosed in |
| 207 | brace pair (e.g. `v0.99.8{caret}\{commit\}`) means the object |
| 208 | could be a tag, and dereference the tag recursively until an |
| 209 | object of that type is found or the object cannot be |
| 210 | dereferenced anymore (in which case, barf). `rev{caret}0` |
| 211 | introduced earlier is a short-hand for `rev{caret}\{commit\}`. |
| 212 | |
| 213 | * A suffix '{caret}' followed by an empty brace pair |
| 214 | (e.g. `v0.99.8{caret}\{\}`) means the object could be a tag, |
| 215 | and dereference the tag recursively until a non-tag object is |
| 216 | found. |
| 217 | |
| Junio C Hamano | 6ac2f14 | 2007-03-01 01:24:56 | [diff] [blame] | 218 | * A colon, followed by a slash, followed by a text: this names |
| 219 | a commit whose commit message starts with the specified text. |
| 220 | This name returns the youngest matching commit which is |
| 221 | reachable from any ref. If the commit message starts with a |
| 222 | '!', you have to repeat that; the special sequence ':/!', |
| 223 | followed by something else than '!' is reserved for now. |
| 224 | |
| Junio C Hamano | fbe0052 | 2006-10-19 05:58:48 | [diff] [blame] | 225 | * A suffix ':' followed by a path; this names the blob or tree |
| 226 | at the given path in the tree-ish object named by the part |
| 227 | before the colon. |
| 228 | |
| 229 | * A colon, optionally followed by a stage number (0 to 3) and a |
| 230 | colon, followed by a path; this names a blob object in the |
| 231 | index at the given path. Missing stage number (and the colon |
| Junio C Hamano | 1f51196 | 2008-01-30 08:28:52 | [diff] [blame] | 232 | that follows it) names a stage 0 entry. During a merge, stage |
| Junio C Hamano | cae8627 | 2007-08-21 02:20:49 | [diff] [blame] | 233 | 1 is the common ancestor, stage 2 is the target branch's version |
| 234 | (typically the current branch), and stage 3 is the version from |
| 235 | the branch being merged. |
| Junio C Hamano | fbe0052 | 2006-10-19 05:58:48 | [diff] [blame] | 236 | |
| Junio C Hamano | 1c95e9d | 2008-02-01 10:52:44 | [diff] [blame] | 237 | Here is an illustration, by Jon Loeliger. Both commit nodes B |
| 238 | and C are parents of commit node A. Parent commits are ordered |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 239 | left-to-right. |
| 240 | |
| 241 | G H I J |
| 242 | \ / \ / |
| 243 | D E F |
| Junio C Hamano | b1d6e88 | 2007-08-11 08:30:16 | [diff] [blame] | 244 | \ | / \ |
| Junio C Hamano | 872c568 | 2006-07-07 06:05:40 | [diff] [blame] | 245 | \ | / | |
| 246 | \|/ | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 247 | B C |
| 248 | \ / |
| 249 | \ / |
| 250 | A |
| 251 | |
| 252 | A = = A^0 |
| 253 | B = A^ = A^1 = A~1 |
| 254 | C = A^2 = A^2 |
| 255 | D = A^^ = A^1^1 = A~2 |
| 256 | E = B^2 = A^^2 |
| 257 | F = B^3 = A^^3 |
| 258 | G = A^^^ = A^1^1^1 = A~3 |
| 259 | H = D^2 = B^^2 = A^^^2 = A~2^2 |
| 260 | I = F^ = B^3^ = A^^3^ |
| 261 | J = F^2 = B^3^2 = A^^3^2 |
| 262 | |
| 263 | |
| Junio C Hamano | 872c568 | 2006-07-07 06:05:40 | [diff] [blame] | 264 | SPECIFYING RANGES |
| 265 | ----------------- |
| 266 | |
| 267 | History traversing commands such as `git-log` operate on a set |
| 268 | of commits, not just a single commit. To these commands, |
| 269 | specifying a single revision with the notation described in the |
| 270 | previous section means the set of commits reachable from that |
| 271 | commit, following the commit ancestry chain. |
| 272 | |
| 273 | To exclude commits reachable from a commit, a prefix `{caret}` |
| 274 | notation is used. E.g. "`{caret}r1 r2`" means commits reachable |
| 275 | from `r2` but exclude the ones reachable from `r1`. |
| 276 | |
| 277 | This set operation appears so often that there is a shorthand |
| 278 | for it. "`r1..r2`" is equivalent to "`{caret}r1 r2`". It is |
| 279 | the difference of two sets (subtract the set of commits |
| 280 | reachable from `r1` from the set of commits reachable from |
| 281 | `r2`). |
| 282 | |
| 283 | A similar notation "`r1\...r2`" is called symmetric difference |
| 284 | of `r1` and `r2` and is defined as |
| 285 | "`r1 r2 --not $(git-merge-base --all r1 r2)`". |
| Junio C Hamano | ea5dae6 | 2007-05-10 23:25:08 | [diff] [blame] | 286 | It is the set of commits that are reachable from either one of |
| Junio C Hamano | 872c568 | 2006-07-07 06:05:40 | [diff] [blame] | 287 | `r1` or `r2` but not from both. |
| 288 | |
| Junio C Hamano | 0d3c815 | 2006-11-08 01:33:41 | [diff] [blame] | 289 | Two other shorthands for naming a set that is formed by a commit |
| 290 | and its parent commits exists. `r1{caret}@` notation means all |
| 291 | parents of `r1`. `r1{caret}!` includes commit `r1` but excludes |
| 292 | its all parents. |
| 293 | |
| Junio C Hamano | 1f51196 | 2008-01-30 08:28:52 | [diff] [blame] | 294 | Here are a handful of examples: |
| Junio C Hamano | 872c568 | 2006-07-07 06:05:40 | [diff] [blame] | 295 | |
| Junio C Hamano | 3aa8182 | 2007-03-30 08:52:26 | [diff] [blame] | 296 | D G H D |
| 297 | D F G H I J D F |
| 298 | ^G D H D |
| 299 | ^D B E I J F B |
| 300 | B...C G H D E B C |
| 301 | ^D B C E I J F B C |
| 302 | C^@ I J F |
| 303 | F^! D G H D F |
| Junio C Hamano | 872c568 | 2006-07-07 06:05:40 | [diff] [blame] | 304 | |
| Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 305 | PARSEOPT |
| 306 | -------- |
| 307 | |
| 308 | In `--parseopt` mode, `git-rev-parse` helps massaging options to bring to shell |
| 309 | scripts the same facilities C builtins have. It works as an option normalizer |
| 310 | (e.g. splits single switches aggregate values), a bit like `getopt(1)` does. |
| 311 | |
| 312 | It takes on the standard input the specification of the options to parse and |
| 313 | understand, and echoes on the standard output a line suitable for `sh(1)` `eval` |
| 314 | to replace the arguments with normalized ones. In case of error, it outputs |
| 315 | usage on the standard error stream, and exits with code 129. |
| 316 | |
| 317 | Input Format |
| 318 | ~~~~~~~~~~~~ |
| 319 | |
| 320 | `git-rev-parse --parseopt` input format is fully text based. It has two parts, |
| 321 | separated by a line that contains only `--`. The lines before the separator |
| 322 | (should be more than one) are used for the usage. |
| 323 | The lines after the separator describe the options. |
| 324 | |
| 325 | Each line of options has this format: |
| 326 | |
| 327 | ------------ |
| Junio C Hamano | bb34317 | 2008-03-09 10:39:09 | [diff] [blame] | 328 | <opt_spec><flags>* SP+ help LF |
| Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 329 | ------------ |
| 330 | |
| 331 | `<opt_spec>`:: |
| 332 | its format is the short option character, then the long option name |
| 333 | separated by a comma. Both parts are not required, though at least one |
| 334 | is necessary. `h,help`, `dry-run` and `f` are all three correct |
| 335 | `<opt_spec>`. |
| 336 | |
| Junio C Hamano | bb34317 | 2008-03-09 10:39:09 | [diff] [blame] | 337 | `<flags>`:: |
| 338 | `<flags>` are of `*`, `=`, `?` or `!`. |
| 339 | * Use `=` if the option takes an argument. |
| 340 | |
| 341 | * Use `?` to mean that the option is optional (though its use is discouraged). |
| 342 | |
| 343 | * Use `*` to mean that this option should not be listed in the usage |
| 344 | generated for the `-h` argument. It's shown for `--help-all` as |
| 345 | documented in linkgit:gitcli[5]. |
| 346 | |
| 347 | * Use `!` to not make the corresponding negated long option available. |
| Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 348 | |
| 349 | The remainder of the line, after stripping the spaces, is used |
| 350 | as the help associated to the option. |
| 351 | |
| 352 | Blank lines are ignored, and lines that don't match this specification are used |
| 353 | as option group headers (start the line with a space to create such |
| 354 | lines on purpose). |
| 355 | |
| 356 | Example |
| 357 | ~~~~~~~ |
| 358 | |
| 359 | ------------ |
| 360 | OPTS_SPEC="\ |
| 361 | some-command [options] <args>... |
| 362 | |
| 363 | some-command does foo and bar! |
| 364 | -- |
| 365 | h,help show the help |
| 366 | |
| 367 | foo some nifty option --foo |
| 368 | bar= some cool option --bar with an argument |
| 369 | |
| 370 | An option group Header |
| 371 | C? option C with an optional argument" |
| 372 | |
| 373 | eval `echo "$OPTS_SPEC" | git-rev-parse --parseopt -- "$@" || echo exit $?` |
| 374 | ------------ |
| 375 | |
| 376 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 377 | Author |
| 378 | ------ |
| Junio C Hamano | e125866 | 2007-11-19 05:03:19 | [diff] [blame] | 379 | Written by Linus Torvalds <torvalds@osdl.org> . |
| 380 | Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 381 | |
| 382 | Documentation |
| 383 | -------------- |
| 384 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 385 | |
| 386 | GIT |
| 387 | --- |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 388 | Part of the linkgit:git[7] suite |