Skip to content

Commit 5a8f311

Browse files
Michael J Grubergitster
authored andcommitted
Documentation: split off rev doc into include file
Currently, the documentation for revisions and ranges sits in the git-rev-parse man page, i.e. a plumbing man page, along with the documentation of all rev-parse modes. Split off the revisions and ranges section into an included file to prepare for restructuring. Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 45e9a82 commit 5a8f311

File tree

2 files changed

+200
-199
lines changed

2 files changed

+200
-199
lines changed

Documentation/git-rev-parse.txt

Lines changed: 1 addition & 199 deletions
Original file line numberDiff line numberDiff line change
@@ -174,205 +174,7 @@ shown. If the pattern does not contain a globbing character (`?`,
174174
Flags and parameters to be parsed.
175175

176176

177-
SPECIFYING REVISIONS
178-
--------------------
179-
180-
A revision parameter typically, but not necessarily, names a
181-
commit object. They use what is called an 'extended SHA1'
182-
syntax. Here are various ways to spell object names. The
183-
ones listed near the end of this list are to name trees and
184-
blobs contained in a commit.
185-
186-
* The full SHA1 object name (40-byte hexadecimal string), or
187-
a substring of such that is unique within the repository.
188-
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
189-
name the same commit object if there are no other object in
190-
your repository whose object name starts with dae86e.
191-
192-
* An output from 'git describe'; i.e. a closest tag, optionally
193-
followed by a dash and a number of commits, followed by a dash, a
194-
`g`, and an abbreviated object name.
195-
196-
* A symbolic ref name. E.g. 'master' typically means the commit
197-
object referenced by refs/heads/master. If you
198-
happen to have both heads/master and tags/master, you can
199-
explicitly say 'heads/master' to tell git which one you mean.
200-
When ambiguous, a `<name>` is disambiguated by taking the
201-
first match in the following rules:
202-
203-
. if `$GIT_DIR/<name>` exists, that is what you mean (this is usually
204-
useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD` and `MERGE_HEAD`);
205-
206-
. otherwise, `refs/<name>` if exists;
207-
208-
. otherwise, `refs/tags/<name>` if exists;
209-
210-
. otherwise, `refs/heads/<name>` if exists;
211-
212-
. otherwise, `refs/remotes/<name>` if exists;
213-
214-
. otherwise, `refs/remotes/<name>/HEAD` if exists.
215-
+
216-
HEAD names the commit your changes in the working tree is based on.
217-
FETCH_HEAD records the branch you fetched from a remote repository
218-
with your last 'git fetch' invocation.
219-
ORIG_HEAD is created by commands that moves your HEAD in a drastic
220-
way, to record the position of the HEAD before their operation, so that
221-
you can change the tip of the branch back to the state before you ran
222-
them easily.
223-
MERGE_HEAD records the commit(s) you are merging into your branch
224-
when you run 'git merge'.
225-
+
226-
Note that any of the `refs/*` cases above may come either from
227-
the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.
228-
229-
* A ref followed by the suffix '@' with a date specification
230-
enclosed in a brace
231-
pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1
232-
second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value
233-
of the ref at a prior point in time. This suffix may only be
234-
used immediately following a ref name and the ref must have an
235-
existing log ($GIT_DIR/logs/<ref>). Note that this looks up the state
236-
of your *local* ref at a given time; e.g., what was in your local
237-
`master` branch last week. If you want to look at commits made during
238-
certain times, see `--since` and `--until`.
239-
240-
* A ref followed by the suffix '@' with an ordinal specification
241-
enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify
242-
the n-th prior value of that ref. For example 'master@\{1\}'
243-
is the immediate prior value of 'master' while 'master@\{5\}'
244-
is the 5th prior value of 'master'. This suffix may only be used
245-
immediately following a ref name and the ref must have an existing
246-
log ($GIT_DIR/logs/<ref>).
247-
248-
* You can use the '@' construct with an empty ref part to get at a
249-
reflog of the current branch. For example, if you are on the
250-
branch 'blabla', then '@\{1\}' means the same as 'blabla@\{1\}'.
251-
252-
* The special construct '@\{-<n>\}' means the <n>th branch checked out
253-
before the current one.
254-
255-
* The suffix '@\{upstream\}' to a ref (short form 'ref@\{u\}') refers to
256-
the branch the ref is set to build on top of. Missing ref defaults
257-
to the current branch.
258-
259-
* A suffix '{caret}' to a revision parameter (e.g. 'HEAD{caret}') means the first parent of
260-
that commit object. '{caret}<n>' means the <n>th parent (i.e.
261-
'rev{caret}'
262-
is equivalent to 'rev{caret}1'). As a special rule,
263-
'rev{caret}0' means the commit itself and is used when 'rev' is the
264-
object name of a tag object that refers to a commit object.
265-
266-
* A suffix '{tilde}<n>' to a revision parameter means the commit
267-
object that is the <n>th generation grand-parent of the named
268-
commit object, following only the first parent. I.e. rev~3 is
269-
equivalent to rev{caret}{caret}{caret} which is equivalent to
270-
rev{caret}1{caret}1{caret}1. See below for a illustration of
271-
the usage of this form.
272-
273-
* A suffix '{caret}' followed by an object type name enclosed in
274-
brace pair (e.g. `v0.99.8{caret}\{commit\}`) means the object
275-
could be a tag, and dereference the tag recursively until an
276-
object of that type is found or the object cannot be
277-
dereferenced anymore (in which case, barf). `rev{caret}0`
278-
introduced earlier is a short-hand for `rev{caret}\{commit\}`.
279-
280-
* A suffix '{caret}' followed by an empty brace pair
281-
(e.g. `v0.99.8{caret}\{\}`) means the object could be a tag,
282-
and dereference the tag recursively until a non-tag object is
283-
found.
284-
285-
* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names
286-
a commit whose commit message starts with the specified text.
287-
This name returns the youngest matching commit which is
288-
reachable from any ref. If the commit message starts with a
289-
'!', you have to repeat that; the special sequence ':/!',
290-
followed by something else than '!' is reserved for now.
291-
292-
* A suffix ':' followed by a path (e.g. `HEAD:README`); this names the blob or tree
293-
at the given path in the tree-ish object named by the part
294-
before the colon.
295-
':path' (with an empty part before the colon, e.g. `:README`)
296-
is a special case of the syntax described next: content
297-
recorded in the index at the given path.
298-
299-
* A colon, optionally followed by a stage number (0 to 3) and a
300-
colon, followed by a path (e.g. `:0:README`); this names a blob object in the
301-
index at the given path. Missing stage number (and the colon
302-
that follows it, e.g. `:README`) names a stage 0 entry. During a merge, stage
303-
1 is the common ancestor, stage 2 is the target branch's version
304-
(typically the current branch), and stage 3 is the version from
305-
the branch being merged.
306-
307-
Here is an illustration, by Jon Loeliger. Both commit nodes B
308-
and C are parents of commit node A. Parent commits are ordered
309-
left-to-right.
310-
311-
........................................
312-
G H I J
313-
\ / \ /
314-
D E F
315-
\ | / \
316-
\ | / |
317-
\|/ |
318-
B C
319-
\ /
320-
\ /
321-
A
322-
........................................
323-
324-
A = = A^0
325-
B = A^ = A^1 = A~1
326-
C = A^2 = A^2
327-
D = A^^ = A^1^1 = A~2
328-
E = B^2 = A^^2
329-
F = B^3 = A^^3
330-
G = A^^^ = A^1^1^1 = A~3
331-
H = D^2 = B^^2 = A^^^2 = A~2^2
332-
I = F^ = B^3^ = A^^3^
333-
J = F^2 = B^3^2 = A^^3^2
334-
335-
336-
SPECIFYING RANGES
337-
-----------------
338-
339-
History traversing commands such as 'git log' operate on a set
340-
of commits, not just a single commit. To these commands,
341-
specifying a single revision with the notation described in the
342-
previous section means the set of commits reachable from that
343-
commit, following the commit ancestry chain.
344-
345-
To exclude commits reachable from a commit, a prefix `{caret}`
346-
notation is used. E.g. `{caret}r1 r2` means commits reachable
347-
from `r2` but exclude the ones reachable from `r1`.
348-
349-
This set operation appears so often that there is a shorthand
350-
for it. When you have two commits `r1` and `r2` (named according
351-
to the syntax explained in SPECIFYING REVISIONS above), you can ask
352-
for commits that are reachable from r2 excluding those that are reachable
353-
from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.
354-
355-
A similar notation `r1\...r2` is called symmetric difference
356-
of `r1` and `r2` and is defined as
357-
`r1 r2 --not $(git merge-base --all r1 r2)`.
358-
It is the set of commits that are reachable from either one of
359-
`r1` or `r2` but not from both.
360-
361-
Two other shorthands for naming a set that is formed by a commit
362-
and its parent commits exist. The `r1{caret}@` notation means all
363-
parents of `r1`. `r1{caret}!` includes commit `r1` but excludes
364-
all of its parents.
365-
366-
Here are a handful of examples:
367-
368-
D G H D
369-
D F G H I J D F
370-
^G D H D
371-
^D B E I J F B
372-
B...C G H D E B C
373-
^D B C E I J F B C
374-
C^@ I J F
375-
F^! D G H D F
177+
include::revisions.txt[]
376178

377179
PARSEOPT
378180
--------

0 commit comments

Comments
 (0)