From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Kyle Meyer <kyle@kyleam.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase docs: drop stray word in merge command description
Date: Sun, 9 Dec 2018 20:41:15 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1812092040320.43@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20181208231541.1341999-1-kyle@kyleam.com>
Hi Kyle,
On Sat, 8 Dec 2018, Kyle Meyer wrote:
> Delete a misplaced word introduced by caafecfcf1 (rebase
> --rebase-merges: adjust man page for octopus support, 2018-03-09).
>
> Signed-off-by: Kyle Meyer <kyle@kyleam.com>
ACK.
Too bad this did not make it into v2.20.0, but at least it can make it
into a future version.
Thanks,
Johannes
> ---
> Documentation/git-rebase.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index dff17b3178..2ee535fb23 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -979,7 +979,7 @@ when the merge operation did not even start), it is rescheduled immediately.
>
> At this time, the `merge` command will *always* use the `recursive`
> merge strategy for regular merges, and `octopus` for octopus merges,
> -strategy, with no way to choose a different one. To work around
> +with no way to choose a different one. To work around
> this, an `exec` command can be used to call `git merge` explicitly,
> using the fact that the labels are worktree-local refs (the ref
> `refs/rewritten/onto` would correspond to the label `onto`, for example).
> --
> 2.19.2
>
>
next prev parent reply other threads:[~2018-12-09 19:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-08 23:15 [PATCH] rebase docs: drop stray word in merge command description Kyle Meyer
2018-12-09 19:41 ` Johannes Schindelin [this message]
2018-12-10 3:31 ` Junio C Hamano
2018-12-10 8:27 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1812092040320.43@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=kyle@kyleam.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).