summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-12-04 21:25:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-05 14:06:18 (GMT)
commit945dc55dda595a3e5449017797cb90599ed9ecb5 (patch)
tree98a75cac402c9a059823b6bf19fd75aa0c7b6f78 /Documentation/git-format-patch.txt
parent700e006c5d69990fc1167355e9fa7a55e9166581 (diff)
downloadgit-945dc55dda595a3e5449017797cb90599ed9ecb5.zip
git-945dc55dda595a3e5449017797cb90599ed9ecb5.tar.gz
git-945dc55dda595a3e5449017797cb90599ed9ecb5.tar.bz2
format-patch: teach --no-base
If `format.useAutoBase = true`, there was no way to override this from the command-line. Teach the `--no-base` option in format-patch to override `format.useAutoBase`. Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Denton Liu <liu.denton@gmail.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.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 00bdf9b..0d4f895 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -333,11 +333,12 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
Output an all-zero hash in each patch's From header instead
of the hash of the commit.
---base=<commit>::
+--[no-]base[=<commit>]::
Record the base tree information to identify the state the
patch series applies to. See the BASE TREE INFORMATION section
below for details. If <commit> is "auto", a base commit is
- automatically chosen.
+ automatically chosen. The `--no-base` option overrides a
+ `format.useAutoBase` configuration.
--root::
Treat the revision argument as a <revision range>, even if it