diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-08-21 02:20:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-08-21 02:20:49 +0000 |
| commit | cae8627f672d77bd3e7a2edf5afa22aa3e5821ce (patch) | |
| tree | 98fefa6bab24f0da714e7eddd63ad41ca4806060 /git-rev-parse.txt | |
| parent | e52cf78cdb9991ea34bfa1f65f3b10fea6a8db3b (diff) | |
| download | git-htmldocs-cae8627f672d77bd3e7a2edf5afa22aa3e5821ce.tar.gz | |
Autogenerated HTML docs for v1.5.3-rc5-46-g23d5
Diffstat (limited to 'git-rev-parse.txt')
| -rw-r--r-- | git-rev-parse.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 4b4d229e6..4758c33de 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -215,7 +215,10 @@ 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. + that follows it) names an 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 |