Skip to content

Rpjday/tools/revisions #1142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 5, 2018
Merged

Rpjday/tools/revisions #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23427d6
Merge branch 'fix_1134'
jnavila Nov 29, 2018
a3fd3d0
revision selection: add clarity to explanation of commit parents
robertpjday Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/05-distributed-git/sections/maintaining.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ It summarizes all the commits in the range you give it; for example, the followi
[source,console]
----
$ git shortlog --no-merges master --not v1.0.1
Chris Wanstrath (8):
Chris Wanstrath (6):
Add support for annotated tags to Grit::Tag
Add packed-refs annotated tag support.
Add Grit::Commit#to_patch
Expand Down
5 changes: 2 additions & 3 deletions book/07-git-tools/sections/revision-selection.asc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,8 @@ $ git show "HEAD^" # OK

====

You can also specify a number after the `^` – for example, `d921970^2` means ``the second parent of d921970.''
This syntax is useful only for merge commits, which have more than one parent.
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:
You can also specify a number after the `^` to identify _which_ parent you want; for example, `d921970^2` means ``the second parent of d921970.''
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`):

[source,console]
----
Expand Down