git_revisions

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision		 Previous revision
git_revisions [2018/05/25 12:00] – [Ancestral Git revisions] rpjdaygit_revisions [2019/03/18 11:45] (current) – [Commits with more than one parent] rpjday
Line 1: Line 1:
 ===== Overview ===== ===== Overview =====
  
- A small sample of Git revisions; different ways to refer to commits (using Linux kernel source).+ A small sample of Git revisions; different ways to refer to commits (using Linux kernel source repo).
  
 ===== Basic Git revisions ===== ===== Basic Git revisions =====
Line 46: Line 46:
 </code> </code>
  
-There's also the tilde notation for brevity, so these are (ignoring intermediate merge commits) equivalent:+There's also the //tilde// notation for brevity, so these are (ignoring intermediate merge commits) equivalent:
  
 <code> <code>
Line 58: Line 58:
 $ git diff v4.16^^ v4.16^ $ git diff v4.16^^ v4.16^
 $ git diff v4.16^ v4.16 $ git diff v4.16^ v4.16
 +</code>
 +
 +===== Commits with more than one parent =====
 +
 +First or second parent:
 +
 +<code>
 +$ git show HEAD^
 +$ git show HEAD^2
 +</code>
 +
 +Getting carried away:
 +
 +<code>
 +$ git show v4.19^2~3^^
 </code> </code>
  • git_revisions.1527249658.txt.gz
  • Last modified: 2018/05/25 12:00
  • by rpjday