mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-01-26 11:33:59 +00:00
22 lines
683 B
Plaintext
22 lines
683 B
Plaintext
---
|
|
syntax: markdown
|
|
tags: [tldr, common]
|
|
source: https://github.com/tldr-pages/tldr.git
|
|
---
|
|
# git range-diff
|
|
|
|
> Compare two commit ranges (e.g. two versions of a branch).
|
|
> More information: <https://git-scm.com/docs/git-range-diff>.
|
|
|
|
- Diff the changes of two individual commits:
|
|
|
|
`git range-diff {{commit_1}}^! {{commit_2}}^!`
|
|
|
|
- Diff the changes of ours and theirs from their common ancestor, e.g. after an interactive rebase:
|
|
|
|
`git range-diff {{theirs}}...{{ours}}`
|
|
|
|
- Diff the changes of two commit ranges, e.g. to check whether conflicts have been resolved appropriately when rebasing commits from `base1` to `base2`:
|
|
|
|
`git range-diff {{base1}}..{{rev1}} {{base2}}..{{rev2}}`
|