summaryrefslogtreecommitdiffstats
path: root/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-01 17:10:25 -0700
committerJunio C Hamano <gitster@pobox.com>2021-11-01 17:10:25 -0700
commit52964adb5d9f69af428a87b5c004c2ac6bd7b824 (patch)
treecd99de6e66ce09182bb7db619024c8d2eeb005f3 /git-format-patch.txt
parent19dcd3f0b9267bf8ca50aa402ecf9f18957583c0 (diff)
downloadgit-htmldocs-52964adb5d9f69af428a87b5c004c2ac6bd7b824.tar.gz
Autogenerated HTML docs for v2.34.0-rc0-19-g0cddd
Diffstat (limited to 'git-format-patch.txt')
-rw-r--r--git-format-patch.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-format-patch.txt b/git-format-patch.txt
index fe2f69d36..113eabc10 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -689,10 +689,10 @@ You can also use `git format-patch --base=P -3 C` to generate patches
for A, B and C, and the identifiers for P, X, Y, Z are appended at the
end of the first message.
-If set `--base=auto` in cmdline, it will track base commit automatically,
-the base commit will be the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will automatically compute
+the base commit as the merge base of tip commit of the remote-tracking
branch and revision-range specified in cmdline.
-For a local branch, you need to track a remote branch by `git branch
+For a local branch, you need to make it to track a remote branch by `git branch
--set-upstream-to` before using this option.
EXAMPLES