summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-07-22 09:57:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-14 21:27:04 (GMT)
commit2e6fd71a52f5bde1c4036b8b0c586ae446f620f8 (patch)
treef841048d434b7cbfa3fbe4e64d3c779bd27e8015 /Documentation/git-format-patch.txt
parent31e2617a5f8fe1c114e72f058d1c035bbf77cffe (diff)
downloadgit-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.zip
git-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.tar.gz
git-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.tar.bz2
format-patch: extend --range-diff to accept revision range
When submitting a revised a patch series, the --range-diff option embeds a range-diff in the cover letter showing changes since the previous version of the patch series. The argument to --range-diff is a simple revision naming the tip of the previous series, which works fine if the previous and current versions of the patch series share a common base. However, it fails if the revision ranges of the old and new versions of the series are disjoint. To address this shortcoming, extend --range-diff to also accept an explicit revision range for the previous series. For example: git format-patch --cover-letter --range-diff=v1~3..v1 -3 v2 Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index e7f404b..425145f 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -243,10 +243,12 @@ feeding the result to `git send-email`.
As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1])
into the cover letter showing the differences between the previous
version of the patch series and the series currently being formatted.
- `previous` is a single revision naming the tip of the previous
- series which shares a common base with the series being formatted (for
+ `previous` can be a single revision naming the tip of the previous
+ series if it shares a common base with the series being formatted (for
example `git format-patch --cover-letter --range-diff=feature/v1 -3
- feature/v2`).
+ feature/v2`), or a revision range if the two versions of the series are
+ disjoint (for example `git format-patch --cover-letter
+ --range-diff=feature/v1~3..feature/v1 -3 feature/v2`).
--notes[=<ref>]::
Append the notes (see linkgit:git-notes[1]) for the commit