git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Document `rebase.forkpoint` in rebase man page

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 20, 2021, 16:07 UTC
Message-ID
<xmqqv92vcjt5.fsf@gitster.g>
In-Reply-To
<20210916224603.2912887-2-wesley@schwengle.net>
wesley@schwengle.net writes:
Show 27 quoted lines
> From: Wesley Schwengle <wesley@opperschaap.net>
>
> 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>
> ---
>  Documentation/git-rebase.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 506345cb0e..c116dbf4bb 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -446,7 +446,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

I still think "the variable gives the default, otherwise the presence of <upstream> on the command line affects which one is used as the default" presentation order is better, but the above is a strict improvement over the current message, so let's take it.

Thanks.
Previous: wesley@schwengle.netNext: Junio C Hamano
Message 16 of 20 in “Possible git bug”
  1. Wesley SchwengleSep 16, 2021
  2. Taylor BlauSep 16, 2021
  3. Wesley SchwengleSep 16, 2021
  4. wesley@schwengle.netSep 16, 2021
  5. Document `rebase.forkpoint` in rebase man pagewesley@schwengle.net, Sep 16, 2021
  6. Junio C HamanoSep 16, 2021
  7. Junio C HamanoSep 16, 2021
  8. wesley@schwengle.netSep 16, 2021
  9. Document `rebase.forkpoint` in rebase man pagewesley@schwengle.net, Sep 16, 2021
  10. Junio C HamanoSep 16, 2021
  11. Wesley SchwengleSep 16, 2021
  12. Junio C HamanoSep 16, 2021
  13. Wesley SchwengleSep 20, 2021
  14. wesley@schwengle.netSep 16, 2021
  15. Document `rebase.forkpoint` in rebase man pagewesley@schwengle.net, Sep 16, 2021
  16. Junio C HamanoSep 20, 2021
  17. Junio C HamanoSep 16, 2021
  18. Wesley SchwengleSep 16, 2021
  19. Junio C HamanoSep 16, 2021
  20. Wesley SchwengleSep 16, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.