summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb8eebb)
raw | patch | inline | side by side (parent: bb8eebb)
author | Miklos Vajna <vmiklos@frugalware.org> | |
Thu, 31 Jan 2008 19:55:57 +0000 (20:55 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 31 Jan 2008 21:59:00 +0000 (13:59 -0800) |
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rev-parse.txt | patch | blob | history |
index af988821b81ee03fecb02ce038a16ca49220009c..f02f6bbb49182c0dffce205b24a4199d824dc776 100644 (file)
(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
-commit parents of commit node A. Parent commits are ordered
+Here is an illustration, by Jon Loeliger. Both commit nodes B
+and C are parents of commit node A. Parent commits are ordered
left-to-right.
G H I J