summaryrefslogtreecommitdiff
path: root/Documentation/git-range-diff.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-17 17:21:41 -0800
commit77348b0e6e350ec81b3880f99c6077d165df2276 (patch)
tree19833dbe1ebf5b5300a0a1cc4bc9c8f136b8b617 /Documentation/git-range-diff.txt
parentMerge branch 'jt/clone-unborn-head' (diff)
parentrange-diff(docs): explain how to specify commit ranges (diff)
downloadtgif-77348b0e6e350ec81b3880f99c6077d165df2276.tar.xz
Merge branch 'js/range-diff-wo-dotdot'
There are other ways than ".." for a single token to denote a "commit range", namely "<rev>^!" and "<rev>^-<n>", but "git range-diff" did not understand them. * js/range-diff-wo-dotdot: range-diff(docs): explain how to specify commit ranges range-diff/format-patch: handle commit ranges other than A..B range-diff/format-patch: refactor check for commit range
Diffstat (limited to 'Documentation/git-range-diff.txt')
-rw-r--r--Documentation/git-range-diff.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt
index 9701c1e5fd..a968d5237d 100644
--- a/Documentation/git-range-diff.txt
+++ b/Documentation/git-range-diff.txt
@@ -28,6 +28,17 @@ Finally, the list of matching commits is shown in the order of the
second commit range, with unmatched commits being inserted just after
all of their ancestors have been shown.
+There are three ways to specify the commit ranges:
+
+- `<range1> <range2>`: Either commit range can be of the form
+ `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES`
+ in linkgit:gitrevisions[7] for more details.
+
+- `<rev1>...<rev2>`. This is equivalent to
+ `<rev2>..<rev1> <rev1>..<rev2>`.
+
+- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1>
+ <base>..<rev2>`.
OPTIONS
-------