diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-17 00:08:32 +0300 |
commit | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (patch) | |
tree | 1b8efa2809270ee2131954f26f3d6850ed19868d /Documentation | |
parent | c9f5fc91142c26c4a0f69f8eaed35c55e9c591f5 (diff) | |
parent | cae0bc09abcb12aff79f1aea85d578df7856de4a (diff) |
Merge branch 'dl/rebase-with-autobase'
"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.
* dl/rebase-with-autobase:
rebase: fix format.useAutoBase breakage
format-patch: teach --no-base
t4014: use test_config()
format-patch: fix indentation
t3400: demonstrate failure with format.useAutoBase
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-format-patch.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 00bdf9b125..0d4f8951bb 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 |