Skip to content

Commit 203eb83

Browse files
committed
format-patch (doc): clarify --base=auto
What --base=auto tells format-patch is to compute the base commit itself, using the tracking information. It does not make anything track anything. Tighten the phrasing so that it won't be copied and pasted to other places. Signed-off-by: Junio C Hamano <[email protected]>
1 parent af6d1d6 commit 203eb83

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/git-format-patch.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,10 @@ You can also use `git format-patch --base=P -3 C` to generate patches
689689
for A, B and C, and the identifiers for P, X, Y, Z are appended at the
690690
end of the first message.
691691

692-
If set `--base=auto` in cmdline, it will track base commit automatically,
693-
the base commit will be the merge base of tip commit of the remote-tracking
692+
If set `--base=auto` in cmdline, it will automatically compute
693+
the base commit as the merge base of tip commit of the remote-tracking
694694
branch and revision-range specified in cmdline.
695-
For a local branch, you need to track a remote branch by `git branch
695+
For a local branch, you need to make it to track a remote branch by `git branch
696696
--set-upstream-to` before using this option.
697697

698698
EXAMPLES

0 commit comments

Comments
 (0)