From: Junio C Hamano <gitster@pobox.com>
To: wesley@schwengle.net
Cc: git@vger.kernel.org, me@ttaylorr.com
Subject: Re: [PATCH] Document `rebase.forkpoint` in rebase man page
Date: Mon, 20 Sep 2021 09:07:18 -0700 [thread overview]
Message-ID: <xmqqv92vcjt5.fsf@gitster.g> (raw)
In-Reply-To: <20210916224603.2912887-2-wesley@schwengle.net> (wesley@schwengle.net's message of "Thu, 16 Sep 2021 18:46:03 -0400")
wesley@schwengle.net writes:
> 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.
next prev parent reply other threads:[~2021-09-20 16:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 3:29 Possible git bug Wesley Schwengle
2021-09-16 5:37 ` Taylor Blau
2021-09-16 12:07 ` Wesley Schwengle
2021-09-16 12:47 ` wesley
2021-09-16 12:47 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-16 15:43 ` Junio C Hamano
2021-09-16 21:21 ` Junio C Hamano
2021-09-16 22:35 ` Possible git bug wesley
2021-09-16 22:35 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-16 22:47 ` Junio C Hamano
2021-09-16 22:50 ` Wesley Schwengle
2021-09-16 22:53 ` Junio C Hamano
2021-09-20 14:34 ` Wesley Schwengle
2021-09-16 22:46 ` Possible git bug wesley
2021-09-16 22:46 ` [PATCH] Document `rebase.forkpoint` in rebase man page wesley
2021-09-20 16:07 ` Junio C Hamano [this message]
2021-09-16 15:33 ` Possible git bug Junio C Hamano
2021-09-16 19:39 ` Wesley Schwengle
2021-09-16 21:52 ` Junio C Hamano
2021-09-16 22:30 ` Wesley Schwengle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqv92vcjt5.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=wesley@schwengle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).