summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-24 05:07:55 (GMT)
commit2cef68f8e5043729952e14f0aa4c595cafbbfc2a (patch)
tree858dd02ded6119da5177ffedd4f8827fffe235f4 /Documentation/git-format-patch.txt
parent5000cd45d80c6789a36e33e70c462ccf1d128dcb (diff)
parent7ba1ceef95959049cb7c4d7369fa8669899ec0e6 (diff)
downloadgit-2cef68f8e5043729952e14f0aa4c595cafbbfc2a.zip
git-2cef68f8e5043729952e14f0aa4c595cafbbfc2a.tar.gz
git-2cef68f8e5043729952e14f0aa4c595cafbbfc2a.tar.bz2
Merge branch 'xy/format-patch-base'
Doc cleanup. * xy/format-patch-base: doc: trivial typo in git-format-patch.txt
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index f7a069b..c890328 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -557,7 +557,7 @@ series A, B, C, the history would be like:
................................................
With `git format-patch --base=P -3 C` (or variants thereof, e.g. with
-`--cover-letter` of using `Z..C` instead of `-3 C` to specify the
+`--cover-letter` or using `Z..C` instead of `-3 C` to specify the
range), the base tree information block is shown at the end of the
first message the command outputs (either the first patch, or the
cover letter), like this: