diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-11-01 13:48:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-01 13:48:08 -0700 |
commit | 7baf6588c5a5f4a1b616e19ddc9430592b608a6f (patch) | |
tree | d581ae46c6d7cab1d90188d79999890d4b92da9e /Documentation/git-format-patch.txt | |
parent | Merge branch 'gc/use-repo-settings' (diff) | |
parent | format-patch (doc): clarify --base=auto (diff) | |
download | tgif-7baf6588c5a5f4a1b616e19ddc9430592b608a6f.tar.xz |
Merge branch 'jc/doc-format-patch-clarify-auto-base'
Rephrase the description of "format-patch --base=auto".
* jc/doc-format-patch-clarify-auto-base:
format-patch (doc): clarify --base=auto
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r-- | Documentation/git-format-patch.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index fe2f69d36e..113eabc107 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/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 |