mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-30 03:16:31 +02:00
Code

Merge branch 'ry/clarify-fast-forward-in-glossary' into next 

The description of "fast-forward" in the glossary has been updated.

* ry/clarify-fast-forward-in-glossary:
  docs: improve fast-forward in glossary content
This commit is contained in:
Junio C Hamano 2021-05-22 18:19:41 +09:00
parent 464b1f187c e22f2daed0
commit 97a851d59f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/glossary-content.txt
View File

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