зеркало из https://github.com/microsoft/git.git
Document `rebase.forkpoint` in rebase man page
The configuration option `rebase.forkpoint' is only mentioned in the man page of git-config(1). Since it is a configuration for rebase, mention it in the documentation of rebase at the --fork-point/--no-fork-point section. This will help users set a preferred default for their workflow. Signed-off-by: Wesley Schwengle <wesley@opperschaap.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
225bc32a98
Коммит
d1e894c6d7
|
@ -445,7 +445,8 @@ When --fork-point is active, 'fork_point' will be used instead of
|
|||
ends up being empty, the <upstream> will be used as a fallback.
|
||||
+
|
||||
If <upstream> is given on the command line, then the default is
|
||||
`--no-fork-point`, otherwise the default is `--fork-point`.
|
||||
`--no-fork-point`, otherwise the default is `--fork-point`. See also
|
||||
`rebase.forkpoint` in linkgit:git-config[1].
|
||||
+
|
||||
If your branch was based on <upstream> but <upstream> was rewound and
|
||||
your branch contains commits which were dropped, this option can be used
|
||||
|
|
Загрузка…
Ссылка в новой задаче