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

[PATCH v2] docs: improve fast-forward in glossary content

From
RGReuven Y. via GitGitGadget <gitgitgadget@gmail.com>
Date
May 19, 2021, 09:28 UTC
Message-ID
<pull.957.v2.git.1621416530195.gitgitgadget@gmail.com>
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
Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 5 in “docs: typo in glossary content”
  1. docs: typo in glossary contentReuven Y. via GitGitGadget, May 19, 2021
  2. Junio C HamanoMay 19, 2021
  3. Junio C HamanoMay 19, 2021
  4. docs: improve fast-forward in glossary contentReuven Y. via GitGitGadget, May 19, 2021
  5. Junio C HamanoMay 19, 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.