All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Reuven Y. via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Reuven Y." <robi@post.jce.ac.il>
Subject: Re: [PATCH v2] docs: improve fast-forward in glossary content
Date: Wed, 19 May 2021 21:10:30 +0900	[thread overview]
Message-ID: <xmqqlf8ayle1.fsf@gitster.g> (raw)
In-Reply-To: <pull.957.v2.git.1621416530195.gitgitgadget@gmail.com> (Reuven Y. via GitGitGadget's message of "Wed, 19 May 2021 09:28:49 +0000")

"Reuven Y. via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Reuven Y <robi@post.jce.ac.il>
>
> The text was somewhat confusing between the revision itself and the autour,
> improved through a discussion with @Junio
>

Sorry but I am not @Junio.

> -	<<def_commit,commit>> but instead just update to his
> -	revision. This will happen frequently on a
> +	<<def_commit,commit>> but instead just update your branch to point at the same
> +    revision as the branch you are merging. This will happen frequently on a

Hmph, I sense a broken indentation.

I'll fix it up, so no need for resending only to fix this.

Thanks.

>  	<<def_remote_tracking_branch,remote-tracking branch>> of a remote
>  	<<def_repository,repository>>.
>  
>
> base-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e

      reply	other threads:[~2021-05-19 12:10 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-19  6:39 [PATCH] docs: typo in glossary content Reuven Y. via GitGitGadget
2021-05-19  7:38 ` Junio C Hamano
2021-05-19  8:36   ` Junio C Hamano
2021-05-19  9:28 ` [PATCH v2] docs: improve fast-forward " Reuven Y. via GitGitGadget
2021-05-19 12:10   ` Junio C Hamano [this message]

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=xmqqlf8ayle1.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=robi@post.jce.ac.il \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.