undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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-06-10 12:04:25 +09:00
commit 7f06d94e72
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_revision,revision>> and you are "merging" another
<<def_branch,branch>>'s changes that happen to be a descendant of what <<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>> 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 your branch to point at the same
revision. This will happen frequently on a revision as the branch you are merging. This will happen frequently on a
<<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_remote_tracking_branch,remote-tracking branch>> of a remote
<<def_repository,repository>>. <<def_repository,repository>>.