2005-08-23 10:49:47 +02:00
|
|
|
git-rev-parse(1)
|
|
|
|
================
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2006-03-09 17:24:50 +01:00
|
|
|
git-rev-parse - Pick out and massage parameters
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2008-06-30 08:09:04 +02:00
|
|
|
'git rev-parse' [ --option ] <args>...
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2005-09-07 23:08:38 +02:00
|
|
|
|
2006-06-03 22:27:26 +02:00
|
|
|
Many git porcelainish commands take mixture of flags
|
2005-09-07 23:08:38 +02:00
|
|
|
(i.e. parameters that begin with a dash '-') and parameters
|
2010-01-10 00:33:00 +01:00
|
|
|
meant for the underlying 'git rev-list' command they use internally
|
2008-06-30 20:56:34 +02:00
|
|
|
and flags and parameters for the other commands they use
|
2010-01-10 00:33:00 +01:00
|
|
|
downstream of 'git rev-list'. This command is used to
|
2005-09-07 23:08:38 +02:00
|
|
|
distinguish between them.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
2007-11-04 11:30:53 +01:00
|
|
|
--parseopt::
|
2010-01-10 00:33:00 +01:00
|
|
|
Use 'git rev-parse' in option parsing mode (see PARSEOPT section below).
|
2007-11-04 11:30:53 +01:00
|
|
|
|
2009-04-28 22:29:24 +02:00
|
|
|
--keep-dashdash::
|
2007-11-04 11:30:53 +01:00
|
|
|
Only meaningful in `--parseopt` mode. Tells the option parser to echo
|
|
|
|
out the first `--` met instead of skipping it.
|
|
|
|
|
2009-06-14 01:58:43 +02:00
|
|
|
--stop-at-non-option::
|
|
|
|
Only meaningful in `--parseopt` mode. Lets the option parser stop at
|
|
|
|
the first non-option argument. This can be used to parse sub-commands
|
2010-01-31 14:24:39 +01:00
|
|
|
that take options themselves.
|
2009-06-14 01:58:43 +02:00
|
|
|
|
2009-04-25 06:55:26 +02:00
|
|
|
--sq-quote::
|
2010-01-10 00:33:00 +01:00
|
|
|
Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE
|
2009-04-25 06:55:26 +02:00
|
|
|
section below). In contrast to the `--sq` option below, this
|
|
|
|
mode does only quoting. Nothing else is done to command input.
|
|
|
|
|
2005-09-07 23:08:38 +02:00
|
|
|
--revs-only::
|
|
|
|
Do not output flags and parameters not meant for
|
2010-01-10 00:33:00 +01:00
|
|
|
'git rev-list' command.
|
2005-09-07 23:08:38 +02:00
|
|
|
|
|
|
|
--no-revs::
|
|
|
|
Do not output flags and parameters meant for
|
2010-01-10 00:33:00 +01:00
|
|
|
'git rev-list' command.
|
2005-09-07 23:08:38 +02:00
|
|
|
|
|
|
|
--flags::
|
|
|
|
Do not output non-flag parameters.
|
|
|
|
|
|
|
|
--no-flags::
|
|
|
|
Do not output flag parameters.
|
|
|
|
|
|
|
|
--default <arg>::
|
|
|
|
If there is no parameter given by the user, use `<arg>`
|
|
|
|
instead.
|
|
|
|
|
|
|
|
--verify::
|
|
|
|
The parameter given must be usable as a single, valid
|
|
|
|
object name. Otherwise barf and abort.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-q::
|
|
|
|
--quiet::
|
2008-04-26 13:57:23 +02:00
|
|
|
Only meaningful in `--verify` mode. Do not output an error
|
|
|
|
message if the first argument is not a valid object name;
|
|
|
|
instead exit with non-zero status silently.
|
|
|
|
|
2005-09-07 23:08:38 +02:00
|
|
|
--sq::
|
|
|
|
Usually the output is made one line per flag and
|
|
|
|
parameter. This option makes output a single line,
|
|
|
|
properly quoted for consumption by shell. Useful when
|
|
|
|
you expect your parameter to contain whitespaces and
|
|
|
|
newlines (e.g. when using pickaxe `-S` with
|
2010-01-10 00:33:00 +01:00
|
|
|
'git diff-\*'). In contrast to the `--sq-quote` option,
|
2009-04-25 06:55:26 +02:00
|
|
|
the command input is still interpreted as usual.
|
2005-09-07 23:08:38 +02:00
|
|
|
|
|
|
|
--not::
|
2005-10-06 01:56:31 +02:00
|
|
|
When showing object names, prefix them with '{caret}' and
|
|
|
|
strip '{caret}' prefix from the object names that already have
|
2005-09-07 23:08:38 +02:00
|
|
|
one.
|
|
|
|
|
|
|
|
--symbolic::
|
|
|
|
Usually the object names are output in SHA1 form (with
|
2005-10-06 01:56:31 +02:00
|
|
|
possible '{caret}' prefix); this option makes them output in a
|
2005-09-07 23:08:38 +02:00
|
|
|
form as close to the original input as possible.
|
|
|
|
|
2008-01-05 21:09:55 +01:00
|
|
|
--symbolic-full-name::
|
|
|
|
This is similar to \--symbolic, but it omits input that
|
|
|
|
are not refs (i.e. branch or tag names; or more
|
|
|
|
explicitly disambiguating "heads/master" form, when you
|
|
|
|
want to name the "master" branch when there is an
|
|
|
|
unfortunately named tag "master"), and show them as full
|
|
|
|
refnames (e.g. "refs/heads/master").
|
2005-09-07 23:08:38 +02:00
|
|
|
|
2009-04-13 13:20:26 +02:00
|
|
|
--abbrev-ref[={strict|loose}]::
|
|
|
|
A non-ambiguous short name of the objects name.
|
|
|
|
The option core.warnAmbiguousRefs is used to select the strict
|
|
|
|
abbreviation mode.
|
|
|
|
|
2005-09-07 23:08:38 +02:00
|
|
|
--all::
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
Show all refs found in `refs/`.
|
2005-09-07 23:08:38 +02:00
|
|
|
|
2010-01-20 10:48:26 +01:00
|
|
|
--branches[=pattern]::
|
|
|
|
--tags[=pattern]::
|
|
|
|
--remotes[=pattern]::
|
2010-01-22 01:21:38 +01:00
|
|
|
Show all branches, tags, or remote-tracking branches,
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
respectively (i.e., refs found in `refs/heads`,
|
|
|
|
`refs/tags`, or `refs/remotes`, respectively).
|
2010-01-22 01:21:38 +01:00
|
|
|
+
|
|
|
|
If a `pattern` is given, only refs matching the given shell glob are
|
|
|
|
shown. If the pattern does not contain a globbing character (`?`,
|
|
|
|
`\*`, or `[`), it is turned into a prefix match by appending `/\*`.
|
|
|
|
|
|
|
|
--glob=pattern::
|
|
|
|
Show all refs matching the shell glob pattern `pattern`. If
|
|
|
|
the pattern does not start with `refs/`, this is automatically
|
|
|
|
prepended. If the pattern does not contain a globbing
|
|
|
|
character (`?`, `\*`, or `[`), it is turned into a prefix
|
|
|
|
match by appending `/\*`.
|
2006-05-14 03:43:00 +02:00
|
|
|
|
2010-01-11 23:33:48 +01:00
|
|
|
--show-toplevel::
|
|
|
|
Show the absolute path of the top-level directory.
|
|
|
|
|
2005-09-07 23:08:38 +02:00
|
|
|
--show-prefix::
|
2005-12-23 07:35:38 +01:00
|
|
|
When the command is invoked from a subdirectory, show the
|
2005-09-07 23:08:38 +02:00
|
|
|
path of the current directory relative to the top-level
|
|
|
|
directory.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
2005-12-23 07:35:38 +01:00
|
|
|
--show-cdup::
|
|
|
|
When the command is invoked from a subdirectory, show the
|
|
|
|
path of the top-level directory relative to the current
|
|
|
|
directory (typically a sequence of "../", or an empty string).
|
|
|
|
|
2006-02-18 02:11:36 +01:00
|
|
|
--git-dir::
|
|
|
|
Show `$GIT_DIR` if defined else show the path to the .git directory.
|
|
|
|
|
2007-06-16 21:03:44 +02:00
|
|
|
--is-inside-git-dir::
|
2007-06-03 16:46:04 +02:00
|
|
|
When the current working directory is below the repository
|
|
|
|
directory print "true", otherwise "false".
|
|
|
|
|
2007-06-06 09:10:42 +02:00
|
|
|
--is-inside-work-tree::
|
|
|
|
When the current working directory is inside the work tree of the
|
|
|
|
repository print "true", otherwise "false".
|
|
|
|
|
2007-06-03 16:46:36 +02:00
|
|
|
--is-bare-repository::
|
|
|
|
When the repository is bare print "true", otherwise "false".
|
2007-06-16 21:03:44 +02:00
|
|
|
|
2010-02-25 00:34:15 +01:00
|
|
|
--local-env-vars::
|
|
|
|
List the GIT_* environment variables that are local to the
|
|
|
|
repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR).
|
|
|
|
Only the names of the variables are listed, not their value,
|
|
|
|
even if they are set.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
--short::
|
|
|
|
--short=number::
|
2006-02-18 02:11:36 +01:00
|
|
|
Instead of outputting the full SHA1 values of object names try to
|
2006-06-03 22:27:26 +02:00
|
|
|
abbreviate them to a shorter unique name. When no length is specified
|
2006-02-18 02:11:36 +01:00
|
|
|
7 is used. The minimum length is 4.
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
--since=datestring::
|
|
|
|
--after=datestring::
|
2008-06-30 20:56:34 +02:00
|
|
|
Parse the date string, and output the corresponding
|
2010-01-10 00:33:00 +01:00
|
|
|
--max-age= parameter for 'git rev-list'.
|
2005-11-03 08:41:25 +01:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
--until=datestring::
|
|
|
|
--before=datestring::
|
2008-06-30 20:56:34 +02:00
|
|
|
Parse the date string, and output the corresponding
|
2010-01-10 00:33:00 +01:00
|
|
|
--min-age= parameter for 'git rev-list'.
|
2005-11-03 08:41:25 +01:00
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
<args>...::
|
2005-09-07 23:08:38 +02:00
|
|
|
Flags and parameters to be parsed.
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
|
2005-09-18 20:13:58 +02:00
|
|
|
SPECIFYING REVISIONS
|
|
|
|
--------------------
|
|
|
|
|
2005-10-17 07:41:59 +02:00
|
|
|
A revision parameter typically, but not necessarily, names a
|
|
|
|
commit object. They use what is called an 'extended SHA1'
|
2006-10-19 05:04:55 +02:00
|
|
|
syntax. Here are various ways to spell object names. The
|
|
|
|
ones listed near the end of this list are to name trees and
|
|
|
|
blobs contained in a commit.
|
2005-09-18 20:13:58 +02:00
|
|
|
|
|
|
|
* The full SHA1 object name (40-byte hexadecimal string), or
|
|
|
|
a substring of such that is unique within the repository.
|
|
|
|
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
|
|
|
|
name the same commit object if there are no other object in
|
|
|
|
your repository whose object name starts with dae86e.
|
|
|
|
|
2010-01-10 00:33:00 +01:00
|
|
|
* An output from 'git describe'; i.e. a closest tag, optionally
|
2008-07-27 02:46:00 +02:00
|
|
|
followed by a dash and a number of commits, followed by a dash, a
|
|
|
|
`g`, and an abbreviated object name.
|
2006-10-19 05:04:55 +02:00
|
|
|
|
2005-09-18 20:13:58 +02:00
|
|
|
* A symbolic ref name. E.g. 'master' typically means the commit
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
object referenced by refs/heads/master. If you
|
2005-09-18 20:13:58 +02:00
|
|
|
happen to have both heads/master and tags/master, you can
|
2005-10-11 01:01:31 +02:00
|
|
|
explicitly say 'heads/master' to tell git which one you mean.
|
2006-10-26 10:15:42 +02:00
|
|
|
When ambiguous, a `<name>` is disambiguated by taking the
|
|
|
|
first match in the following rules:
|
2005-09-18 20:13:58 +02:00
|
|
|
|
2006-10-26 10:15:42 +02:00
|
|
|
. if `$GIT_DIR/<name>` exists, that is what you mean (this is usually
|
2008-07-07 23:58:58 +02:00
|
|
|
useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD` and `MERGE_HEAD`);
|
2006-10-26 10:15:42 +02:00
|
|
|
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
. otherwise, `refs/<name>` if exists;
|
2006-10-26 10:15:42 +02:00
|
|
|
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
. otherwise, `refs/tags/<name>` if exists;
|
2006-10-26 10:15:42 +02:00
|
|
|
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
. otherwise, `refs/heads/<name>` if exists;
|
2006-10-26 10:15:42 +02:00
|
|
|
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
. otherwise, `refs/remotes/<name>` if exists;
|
2006-10-26 10:15:42 +02:00
|
|
|
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
. otherwise, `refs/remotes/<name>/HEAD` if exists.
|
2008-07-07 23:58:58 +02:00
|
|
|
+
|
|
|
|
HEAD names the commit your changes in the working tree is based on.
|
|
|
|
FETCH_HEAD records the branch you fetched from a remote repository
|
2010-01-10 00:33:00 +01:00
|
|
|
with your last 'git fetch' invocation.
|
2008-07-07 23:58:58 +02:00
|
|
|
ORIG_HEAD is created by commands that moves your HEAD in a drastic
|
|
|
|
way, to record the position of the HEAD before their operation, so that
|
|
|
|
you can change the tip of the branch back to the state before you ran
|
|
|
|
them easily.
|
|
|
|
MERGE_HEAD records the commit(s) you are merging into your branch
|
2010-01-10 00:33:00 +01:00
|
|
|
when you run 'git merge'.
|
docs: don't talk about $GIT_DIR/refs/ everywhere
It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we
may also consult the packed refs mechanism. These days we tend to treat
the "refs hierarchy" as more of an abstract namespace that happens to be
represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at
worst it can confuse users who then look in $GIT_DIR/refs and find that it
is missing some of the refs they expected to see.
This patch drops most uses of "$GIT_DIR/refs/*", changing them into just
"refs/*", under the assumption that users can handle the concept of an
abstract refs namespace. There are a few things to note:
- most cases just dropped the $GIT_DIR/ portion. But for cases where
that left _just_ the word "refs", I changed it to "refs/" to help
indicate that it was a hierarchy. I didn't do the same for longer
paths (e.g., "refs/heads" remained, instead of becoming
"refs/heads/").
- in some cases, no change was made, as the text was explicitly about
unpacked refs (e.g., the discussion in git-pack-refs).
- In some cases it made sense instead to note the existence of packed
refs (e.g., in check-ref-format and rev-parse).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-02-18 02:16:20 +01:00
|
|
|
+
|
|
|
|
Note that any of the `refs/*` cases above may come either from
|
|
|
|
the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.
|
2006-10-26 10:15:42 +02:00
|
|
|
|
|
|
|
* A ref followed by the suffix '@' with a date specification
|
|
|
|
enclosed in a brace
|
2006-05-19 09:29:43 +02:00
|
|
|
pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1
|
|
|
|
second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value
|
|
|
|
of the ref at a prior point in time. This suffix may only be
|
|
|
|
used immediately following a ref name and the ref must have an
|
2008-06-30 05:27:45 +02:00
|
|
|
existing log ($GIT_DIR/logs/<ref>). Note that this looks up the state
|
|
|
|
of your *local* ref at a given time; e.g., what was in your local
|
|
|
|
`master` branch last week. If you want to look at commits made during
|
|
|
|
certain times, see `--since` and `--until`.
|
2006-05-17 11:56:09 +02:00
|
|
|
|
2007-01-18 03:08:04 +01:00
|
|
|
* A ref followed by the suffix '@' with an ordinal specification
|
|
|
|
enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify
|
|
|
|
the n-th prior value of that ref. For example 'master@\{1\}'
|
|
|
|
is the immediate prior value of 'master' while 'master@\{5\}'
|
|
|
|
is the 5th prior value of 'master'. This suffix may only be used
|
|
|
|
immediately following a ref name and the ref must have an existing
|
|
|
|
log ($GIT_DIR/logs/<ref>).
|
|
|
|
|
2007-02-02 00:21:49 +01:00
|
|
|
* You can use the '@' construct with an empty ref part to get at a
|
|
|
|
reflog of the current branch. For example, if you are on the
|
|
|
|
branch 'blabla', then '@\{1\}' means the same as 'blabla@\{1\}'.
|
|
|
|
|
2009-01-17 17:09:55 +01:00
|
|
|
* The special construct '@\{-<n>\}' means the <n>th branch checked out
|
|
|
|
before the current one.
|
|
|
|
|
2010-02-10 17:30:29 +01:00
|
|
|
* The suffix '@\{upstream\}' to a ref (short form 'ref@\{u\}') refers to
|
2009-09-10 17:25:57 +02:00
|
|
|
the branch the ref is set to build on top of. Missing ref defaults
|
|
|
|
to the current branch.
|
|
|
|
|
2005-10-06 01:56:31 +02:00
|
|
|
* A suffix '{caret}' to a revision parameter means the first parent of
|
|
|
|
that commit object. '{caret}<n>' means the <n>th parent (i.e.
|
|
|
|
'rev{caret}'
|
|
|
|
is equivalent to 'rev{caret}1'). As a special rule,
|
|
|
|
'rev{caret}0' means the commit itself and is used when 'rev' is the
|
2005-09-18 20:13:58 +02:00
|
|
|
object name of a tag object that refers to a commit object.
|
|
|
|
|
2006-10-03 07:52:57 +02:00
|
|
|
* A suffix '{tilde}<n>' to a revision parameter means the commit
|
2005-09-18 20:13:58 +02:00
|
|
|
object that is the <n>th generation grand-parent of the named
|
|
|
|
commit object, following only the first parent. I.e. rev~3 is
|
2006-10-26 10:15:42 +02:00
|
|
|
equivalent to rev{caret}{caret}{caret} which is equivalent to
|
|
|
|
rev{caret}1{caret}1{caret}1. See below for a illustration of
|
|
|
|
the usage of this form.
|
2005-09-18 20:13:58 +02:00
|
|
|
|
2005-10-17 07:41:59 +02:00
|
|
|
* A suffix '{caret}' followed by an object type name enclosed in
|
|
|
|
brace pair (e.g. `v0.99.8{caret}\{commit\}`) means the object
|
|
|
|
could be a tag, and dereference the tag recursively until an
|
|
|
|
object of that type is found or the object cannot be
|
|
|
|
dereferenced anymore (in which case, barf). `rev{caret}0`
|
|
|
|
introduced earlier is a short-hand for `rev{caret}\{commit\}`.
|
|
|
|
|
|
|
|
* A suffix '{caret}' followed by an empty brace pair
|
|
|
|
(e.g. `v0.99.8{caret}\{\}`) means the object could be a tag,
|
|
|
|
and dereference the tag recursively until a non-tag object is
|
|
|
|
found.
|
|
|
|
|
2007-02-24 03:08:20 +01:00
|
|
|
* A colon, followed by a slash, followed by a text: this names
|
|
|
|
a commit whose commit message starts with the specified text.
|
|
|
|
This name returns the youngest matching commit which is
|
|
|
|
reachable from any ref. If the commit message starts with a
|
|
|
|
'!', you have to repeat that; the special sequence ':/!',
|
|
|
|
followed by something else than '!' is reserved for now.
|
|
|
|
|
2006-10-19 05:04:55 +02:00
|
|
|
* A suffix ':' followed by a path; this names the blob or tree
|
|
|
|
at the given path in the tree-ish object named by the part
|
2010-06-27 15:15:22 +02:00
|
|
|
before the colon. ":path" (with an empty part before the colon)
|
|
|
|
is a special case of the syntax described next: content
|
|
|
|
recorded in the index at the given path.
|
2006-10-19 05:04:55 +02:00
|
|
|
|
|
|
|
* A colon, optionally followed by a stage number (0 to 3) and a
|
|
|
|
colon, followed by a path; this names a blob object in the
|
|
|
|
index at the given path. Missing stage number (and the colon
|
2008-01-29 20:38:55 +01:00
|
|
|
that follows it) names a stage 0 entry. During a merge, stage
|
2007-08-20 05:36:38 +02:00
|
|
|
1 is the common ancestor, stage 2 is the target branch's version
|
|
|
|
(typically the current branch), and stage 3 is the version from
|
|
|
|
the branch being merged.
|
2006-10-19 05:04:55 +02:00
|
|
|
|
2008-01-31 20:55:57 +01:00
|
|
|
Here is an illustration, by Jon Loeliger. Both commit nodes B
|
|
|
|
and C are parents of commit node A. Parent commits are ordered
|
2005-11-03 22:52:44 +01:00
|
|
|
left-to-right.
|
|
|
|
|
2008-05-26 15:24:02 +02:00
|
|
|
........................................
|
|
|
|
G H I J
|
|
|
|
\ / \ /
|
|
|
|
D E F
|
|
|
|
\ | / \
|
|
|
|
\ | / |
|
|
|
|
\|/ |
|
|
|
|
B C
|
|
|
|
\ /
|
|
|
|
\ /
|
|
|
|
A
|
|
|
|
........................................
|
2005-11-03 22:52:44 +01:00
|
|
|
|
|
|
|
A = = A^0
|
|
|
|
B = A^ = A^1 = A~1
|
|
|
|
C = A^2 = A^2
|
|
|
|
D = A^^ = A^1^1 = A~2
|
|
|
|
E = B^2 = A^^2
|
|
|
|
F = B^3 = A^^3
|
|
|
|
G = A^^^ = A^1^1^1 = A~3
|
|
|
|
H = D^2 = B^^2 = A^^^2 = A~2^2
|
|
|
|
I = F^ = B^3^ = A^^3^
|
|
|
|
J = F^2 = B^3^2 = A^^3^2
|
|
|
|
|
2005-09-18 20:13:58 +02:00
|
|
|
|
2006-07-07 07:37:51 +02:00
|
|
|
SPECIFYING RANGES
|
|
|
|
-----------------
|
|
|
|
|
2010-01-10 00:33:00 +01:00
|
|
|
History traversing commands such as 'git log' operate on a set
|
2006-07-07 07:37:51 +02:00
|
|
|
of commits, not just a single commit. To these commands,
|
|
|
|
specifying a single revision with the notation described in the
|
|
|
|
previous section means the set of commits reachable from that
|
|
|
|
commit, following the commit ancestry chain.
|
|
|
|
|
|
|
|
To exclude commits reachable from a commit, a prefix `{caret}`
|
2009-03-15 12:30:52 +01:00
|
|
|
notation is used. E.g. `{caret}r1 r2` means commits reachable
|
2006-07-07 07:37:51 +02:00
|
|
|
from `r2` but exclude the ones reachable from `r1`.
|
|
|
|
|
|
|
|
This set operation appears so often that there is a shorthand
|
2008-07-07 23:58:58 +02:00
|
|
|
for it. When you have two commits `r1` and `r2` (named according
|
|
|
|
to the syntax explained in SPECIFYING REVISIONS above), you can ask
|
|
|
|
for commits that are reachable from r2 excluding those that are reachable
|
2009-03-15 12:30:52 +01:00
|
|
|
from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.
|
2006-07-07 07:37:51 +02:00
|
|
|
|
2009-03-15 12:30:52 +01:00
|
|
|
A similar notation `r1\...r2` is called symmetric difference
|
2006-07-07 07:37:51 +02:00
|
|
|
of `r1` and `r2` and is defined as
|
2009-03-15 12:30:52 +01:00
|
|
|
`r1 r2 --not $(git merge-base --all r1 r2)`.
|
2007-04-30 20:37:57 +02:00
|
|
|
It is the set of commits that are reachable from either one of
|
2006-07-07 07:37:51 +02:00
|
|
|
`r1` or `r2` but not from both.
|
|
|
|
|
2006-10-31 23:22:34 +01:00
|
|
|
Two other shorthands for naming a set that is formed by a commit
|
2008-07-06 22:34:21 +02:00
|
|
|
and its parent commits exist. The `r1{caret}@` notation means all
|
2006-10-31 23:22:34 +01:00
|
|
|
parents of `r1`. `r1{caret}!` includes commit `r1` but excludes
|
2008-07-06 22:34:21 +02:00
|
|
|
all of its parents.
|
2006-10-31 23:22:34 +01:00
|
|
|
|
2008-01-29 20:38:55 +01:00
|
|
|
Here are a handful of examples:
|
2006-07-07 07:37:51 +02:00
|
|
|
|
2007-03-29 08:42:44 +02:00
|
|
|
D G H D
|
|
|
|
D F G H I J D F
|
|
|
|
^G D H D
|
|
|
|
^D B E I J F B
|
|
|
|
B...C G H D E B C
|
|
|
|
^D B C E I J F B C
|
|
|
|
C^@ I J F
|
|
|
|
F^! D G H D F
|
2006-07-07 07:37:51 +02:00
|
|
|
|
2007-11-04 11:30:53 +01:00
|
|
|
PARSEOPT
|
|
|
|
--------
|
|
|
|
|
2010-01-10 00:33:00 +01:00
|
|
|
In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to shell
|
2007-11-04 11:30:53 +01:00
|
|
|
scripts the same facilities C builtins have. It works as an option normalizer
|
|
|
|
(e.g. splits single switches aggregate values), a bit like `getopt(1)` does.
|
|
|
|
|
|
|
|
It takes on the standard input the specification of the options to parse and
|
|
|
|
understand, and echoes on the standard output a line suitable for `sh(1)` `eval`
|
|
|
|
to replace the arguments with normalized ones. In case of error, it outputs
|
|
|
|
usage on the standard error stream, and exits with code 129.
|
|
|
|
|
|
|
|
Input Format
|
|
|
|
~~~~~~~~~~~~
|
|
|
|
|
2010-01-10 00:33:00 +01:00
|
|
|
'git rev-parse --parseopt' input format is fully text based. It has two parts,
|
2007-11-04 11:30:53 +01:00
|
|
|
separated by a line that contains only `--`. The lines before the separator
|
|
|
|
(should be more than one) are used for the usage.
|
|
|
|
The lines after the separator describe the options.
|
|
|
|
|
|
|
|
Each line of options has this format:
|
|
|
|
|
|
|
|
------------
|
2008-03-02 09:21:38 +01:00
|
|
|
<opt_spec><flags>* SP+ help LF
|
2007-11-04 11:30:53 +01:00
|
|
|
------------
|
|
|
|
|
|
|
|
`<opt_spec>`::
|
|
|
|
its format is the short option character, then the long option name
|
|
|
|
separated by a comma. Both parts are not required, though at least one
|
|
|
|
is necessary. `h,help`, `dry-run` and `f` are all three correct
|
|
|
|
`<opt_spec>`.
|
|
|
|
|
2008-03-02 09:21:38 +01:00
|
|
|
`<flags>`::
|
|
|
|
`<flags>` are of `*`, `=`, `?` or `!`.
|
|
|
|
* Use `=` if the option takes an argument.
|
|
|
|
|
|
|
|
* Use `?` to mean that the option is optional (though its use is discouraged).
|
|
|
|
|
|
|
|
* Use `*` to mean that this option should not be listed in the usage
|
|
|
|
generated for the `-h` argument. It's shown for `--help-all` as
|
2008-05-02 05:30:47 +02:00
|
|
|
documented in linkgit:gitcli[7].
|
2008-03-02 09:21:38 +01:00
|
|
|
|
|
|
|
* Use `!` to not make the corresponding negated long option available.
|
2007-11-04 11:30:53 +01:00
|
|
|
|
|
|
|
The remainder of the line, after stripping the spaces, is used
|
|
|
|
as the help associated to the option.
|
|
|
|
|
|
|
|
Blank lines are ignored, and lines that don't match this specification are used
|
|
|
|
as option group headers (start the line with a space to create such
|
|
|
|
lines on purpose).
|
|
|
|
|
|
|
|
Example
|
|
|
|
~~~~~~~
|
|
|
|
|
|
|
|
------------
|
|
|
|
OPTS_SPEC="\
|
|
|
|
some-command [options] <args>...
|
|
|
|
|
|
|
|
some-command does foo and bar!
|
|
|
|
--
|
|
|
|
h,help show the help
|
|
|
|
|
|
|
|
foo some nifty option --foo
|
|
|
|
bar= some cool option --bar with an argument
|
|
|
|
|
|
|
|
An option group Header
|
|
|
|
C? option C with an optional argument"
|
|
|
|
|
2008-06-30 08:09:04 +02:00
|
|
|
eval `echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?`
|
2007-11-04 11:30:53 +01:00
|
|
|
------------
|
|
|
|
|
2009-04-25 06:55:26 +02:00
|
|
|
SQ-QUOTE
|
|
|
|
--------
|
|
|
|
|
2010-01-10 00:33:00 +01:00
|
|
|
In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a
|
2009-04-25 06:55:26 +02:00
|
|
|
single line suitable for `sh(1)` `eval`. This line is made by
|
|
|
|
normalizing the arguments following `--sq-quote`. Nothing other than
|
|
|
|
quoting the arguments is done.
|
|
|
|
|
|
|
|
If you want command input to still be interpreted as usual by
|
2010-01-10 00:33:00 +01:00
|
|
|
'git rev-parse' before the output is shell quoted, see the `--sq`
|
2009-04-25 06:55:26 +02:00
|
|
|
option.
|
|
|
|
|
|
|
|
Example
|
|
|
|
~~~~~~~
|
|
|
|
|
|
|
|
------------
|
|
|
|
$ cat >your-git-script.sh <<\EOF
|
|
|
|
#!/bin/sh
|
|
|
|
args=$(git rev-parse --sq-quote "$@") # quote user-supplied arguments
|
|
|
|
command="git frotz -n24 $args" # and use it inside a handcrafted
|
|
|
|
# command line
|
|
|
|
eval "$command"
|
|
|
|
EOF
|
|
|
|
|
|
|
|
$ sh your-git-script.sh "a b'c"
|
|
|
|
------------
|
|
|
|
|
2008-05-13 06:51:41 +02:00
|
|
|
EXAMPLES
|
|
|
|
--------
|
|
|
|
|
|
|
|
* Print the object name of the current commit:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git rev-parse --verify HEAD
|
|
|
|
------------
|
|
|
|
|
|
|
|
* Print the commit object name from the revision in the $REV shell variable:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git rev-parse --verify $REV
|
|
|
|
------------
|
|
|
|
+
|
|
|
|
This will error out if $REV is empty or not a valid revision.
|
|
|
|
|
|
|
|
* Same as above:
|
|
|
|
+
|
|
|
|
------------
|
|
|
|
$ git rev-parse --default master --verify $REV
|
|
|
|
------------
|
|
|
|
+
|
|
|
|
but if $REV is empty, the commit object name from master will be printed.
|
|
|
|
|
2007-11-04 11:30:53 +01:00
|
|
|
|
2005-08-23 10:49:47 +02:00
|
|
|
Author
|
|
|
|
------
|
2007-11-04 11:30:53 +01:00
|
|
|
Written by Linus Torvalds <torvalds@osdl.org> .
|
2008-07-21 21:14:42 +02:00
|
|
|
Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org>
|
2005-08-23 10:49:47 +02:00
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|