Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
| git_revisions [2018/05/27 10:43] – [Overview] rpjday | git_revisions [2019/03/18 11:45] (current) – [Commits with more than one parent] rpjday | ||
|---|---|---|---|
| Line 46: | Line 46: | ||
| </ | </ | ||
| - | There' | + | There' |
| < | < | ||
| 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 | ||
| + | </ | ||
| + | |||
| + | ===== Commits with more than one parent ===== | ||
| + | |||
| + | First or second parent: | ||
| + | |||
| + | < | ||
| + | $ git show HEAD^ | ||
| + | $ git show HEAD^2 | ||
| + | </ | ||
| + | |||
| + | Getting carried away: | ||
| + | |||
| + | < | ||
| + | $ git show v4.19^2~3^^ | ||
| </ | </ | ||