diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-18 01:21:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-18 01:21:41 (GMT) |
| commit | 77348b0e6e350ec81b3880f99c6077d165df2276 (patch) | |
| tree | 19833dbe1ebf5b5300a0a1cc4bc9c8f136b8b617 /Documentation | |
| parent | 69571dfe219f48614e0e0ae7e28efae0be297764 (diff) | |
| parent | 2cc543deab38c188906c41e537dc5c7de98b93d7 (diff) | |
| download | git-77348b0e6e350ec81b3880f99c6077d165df2276.zip git-77348b0e6e350ec81b3880f99c6077d165df2276.tar.gz git-77348b0e6e350ec81b3880f99c6077d165df2276.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/git-range-diff.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt index 9701c1e..a968d52 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 ------- |