From: "Reuven Y. via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Reuven Y." <robi@post.jce.ac.il>, Reuven Y <robi@post.jce.ac.il>
Subject: [PATCH v2] docs: improve fast-forward in glossary content
Date: Wed, 19 May 2021 09:28:49 +0000 [thread overview]
Message-ID: <pull.957.v2.git.1621416530195.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.957.git.1621406381404.gitgitgadget@gmail.com>
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
Signed-off-by: Reuven Yagel <robi@post.jce.ac.il>
---
typo in glossary content
his->this The 't' probably just failed while typing, since we refer here
to a branch not a person
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-957%2Frobi-y%2Fmaster-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-957/robi-y/master-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/957
Range-diff vs v1:
1: c063a7f9abfd ! 1: 66a3f7e642b6 docs: typo in glossary content
@@ Metadata
Author: Reuven Y <robi@post.jce.ac.il>
## Commit message ##
- docs: typo in glossary content
+ docs: improve fast-forward in glossary content
- his->this
- The 't' probably just failed while typing, since we refer here to a branch not a person
+ The text was somewhat confusing between the revision itself and the autour,
+ improved through a discussion with @Junio
Signed-off-by: Reuven Yagel <robi@post.jce.ac.il>
@@ Documentation/glossary-content.txt: current branch integrates with) obviously do
<<def_branch,branch>>'s changes that happen to be a descendant of what
you have. In such a case, you do not make a new <<def_merge,merge>>
- <<def_commit,commit>> but instead just update to his
-+ <<def_commit,commit>> but instead just update to this
- revision. This will happen frequently on a
+- 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
<<def_remote_tracking_branch,remote-tracking branch>> of a remote
<<def_repository,repository>>.
+
Documentation/glossary-content.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 67c7a50b96a0..a22cef39fab0 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -146,8 +146,8 @@ current branch integrates with) obviously do not work, as there is no
<<def_revision,revision>> and you are "merging" another
<<def_branch,branch>>'s changes that happen to be a descendant of what
you have. In such a case, you do not make a new <<def_merge,merge>>
- <<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
<<def_remote_tracking_branch,remote-tracking branch>> of a remote
<<def_repository,repository>>.
base-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e
--
gitgitgadget
next prev parent reply other threads:[~2021-05-19 9:28 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 ` Reuven Y. via GitGitGadget [this message]
2021-05-19 12:10 ` [PATCH v2] docs: improve fast-forward " Junio C Hamano
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=pull.957.v2.git.1621416530195.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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 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).