diff --git a/git-revisions.md b/git-revisions.md index f475849be..a0bdaf626 100644 --- a/git-revisions.md +++ b/git-revisions.md @@ -2,42 +2,50 @@ title: Git revisions --- -### Single commits +### Commits -- commits: - - `dae68e1` (sha1) +| `dae68e1` | sha1 | +{:.shortcuts} -- refs: - - `HEAD` (ref) - - `master` (branch) - - `v1.0.0` (tag) - - `origin/master` (aka, *refs/remotes/origin/master*) - - `heads/master` - - `refs/heads/master` +### References -- search back: - - `master@{yesterday}` - - `master@{2}` (2nd prior value) - - `master@{push}` (where *master* would push to) - - `master^` (parent) - - `master^2` (2nd parent, eg, what it merged) - - `master~5` (5 parents back) - - `master^0` (this commit; disambiguates from tags) - - `v0.99.8^{tag}` (can be *commit*, *tag*, *tree*, *object*) - - `v0.99.8^{}` (defaults to *{tag}*) - - `:/fix bug` (searches commit messages) -- other: - - `HEAD:README` - - `0:README` (0 to 3) +| `HEAD` | reference | +| `master` | branch | +| `v1.0.0` | tag | +| `origin/master` | aka, *refs/remotes/origin/master* | +| `heads/master` | aka, *refs/heads/master* | +| `refs/heads/master` | ... | +{:.shortcuts} -### Ranges +### Searching back -- `master` (reachable parents from master) -- `^master` (exclude reachable parents from master) -- `master..fix` (reachable from *fix* but not *master*) -- `master...fix` (reachable from *fix* and *master*, but not both) -- `HEAD^@` (parents of *HEAD*) -- `HEAD^!` (*HEAD*, then excluding parents's ancestors) +| `master@{yesterday}` | also *1 day ago*, etc | +| `master@{2}` | 2nd prior value | +| `master@{push}` | where *master* would push to | +| `master^` | parent commit | +| `master^2` | 2nd parent, eg, what it merged | +| `master~5` | 5 parents back | +| `master^0` | this commit; disambiguates from tags | +| `v0.99.8^{tag}` | can be *commit*, *tag*, *tree*, *object* | +| `v0.99.8^{}` | defaults to *{tag}* | +| `:/fix bug` | searches commit messages | +{:.shortcuts} + +### Other + +| `HEAD:README` | ... | +| `0:README` | (0 to 3) ... | +{:.shortcuts} + +## Ranges + +| `master` | reachable parents from master | +| `^master` | exclude reachable parents from master | +| `master..fix` | reachable from *fix* but not *master* | +| `master...fix` | reachable from *fix* and *master*, but not both | +| `HEAD^@` | parents of *HEAD* | +| `HEAD^!` | *HEAD*, then excluding parents's ancestors | +{:.shortcuts} ### Ranges illustration