diff mbox series

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

Message ID pull.957.v2.git.1621416530195.gitgitgadget@gmail.com (mailing list archive)
State New, archived
Headers show
Series [v2] docs: improve fast-forward in glossary content | expand

Commit Message

Reuven Y May 19, 2021, 9:28 a.m. UTC 
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(-)


base-commit: bf949ade81106fbda068c1fdb2c6fd1cb1babe7e

Comments

Junio C Hamano May 19, 2021, 12:10 p.m. UTC | #1 
"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
diff mbox series

Patch

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>>.