git-range-diff: add page (#5701)

manned-org^2
Janek 2021-05-28 20:01:27 +02:00 committed by GitHub
parent 9fe15f5609
commit 7aefc85884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,16 @@
# 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}}`