diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-01-30 08:28:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-01-30 08:28:52 +0000 |
| commit | 1f51196d6e5d90b427ef64b6769c2c32e1577942 (patch) | |
| tree | 443121ff9a66322a51608b996b6b2e23ae6e807a /git-rev-parse.txt | |
| parent | e35a6fc91bc4b7cd8763e7d1d06c02d7ce22d9c1 (diff) | |
| download | git-htmldocs-1f51196d6e5d90b427ef64b6769c2c32e1577942.tar.gz | |
Autogenerated HTML docs for v1.5.4-rc5-11-g0eab8
Diffstat (limited to 'git-rev-parse.txt')
| -rw-r--r-- | git-rev-parse.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 5d9c36985..af988821b 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -229,13 +229,13 @@ blobs contained in a commit. * 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 - that follows it) names an stage 0 entry. During a merge, stage + that follows it) names a stage 0 entry. During a merge, stage 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. Here is an illustration, by Jon Loeliger. Both node B and C are -a commit parents of commit node A. Parent commits are ordered +commit parents of commit node A. Parent commits are ordered left-to-right. G H I J @@ -291,7 +291,7 @@ and its parent commits exists. `r1{caret}@` notation means all parents of `r1`. `r1{caret}!` includes commit `r1` but excludes its all parents. -Here are a handful examples: +Here are a handful of examples: D G H D D F G H I J D F |