Skip to content

Commit 5dbc059

Browse files
authored
Merge pull request #1142 from rpjday/rpjday/tools/revisions
Rpjday/tools/revisions
2 parents 7e9c0a1 + a3fd3d0 commit 5dbc059

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

book/07-git-tools/sections/revision-selection.asc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,8 @@ $ git show "HEAD^" # OK
227227
228228
====
229229

230-
You can also specify a number after the `^` – for example, `d921970^2` means ``the second parent of d921970.''
231-
This syntax is useful only for merge commits, which have more than one parent.
232-
The first parent is the branch you were on when you merged, and the second is the commit on the branch that you merged in:
230+
You can also specify a number after the `^` to identify _which_ parent you want; for example, `d921970^2` means ``the second parent of d921970.''
231+
This syntax is useful only for merge commits, which have more than one parent -- the _first_ parent of a merge commit is from the branch you were on when you merged (frequently `master`), while the _second_ parent of a merge commit is from the branch that was merged (say, `topic`):
233232

234233
[source,console]
235234
----

0 commit comments

Comments
 (0)