From 7aefc8588438fe27f355458934bcebf91b8a5897 Mon Sep 17 00:00:00 2001 From: Janek <27jf@pm.me> Date: Fri, 28 May 2021 20:01:27 +0200 Subject: [PATCH] git-range-diff: add page (#5701) --- pages/common/git-range-diff.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pages/common/git-range-diff.md diff --git a/pages/common/git-range-diff.md b/pages/common/git-range-diff.md new file mode 100644 index 000000000..0a28e9e9e --- /dev/null +++ b/pages/common/git-range-diff.md @@ -0,0 +1,16 @@ +# git range-diff + +> Compare two commit ranges (e.g. two versions of a branch). +> More information: . + +- 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}}`