Skip to content

Commit e22f2da

Browse files
robi-ygitster
authored andcommitted
docs: improve fast-forward in glossary content
The text was somewhat confusing between the revision itself and the author. Signed-off-by: Reuven Yagel <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 48bf2fa commit e22f2da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/glossary-content.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ current branch integrates with) obviously do not work, as there is no
146146
<<def_revision,revision>> and you are "merging" another
147147
<<def_branch,branch>>'s changes that happen to be a descendant of what
148148
you have. In such a case, you do not make a new <<def_merge,merge>>
149-
<<def_commit,commit>> but instead just update to his
150-
revision. This will happen frequently on a
149+
<<def_commit,commit>> but instead just update your branch to point at the same
150+
revision as the branch you are merging. This will happen frequently on a
151151
<<def_remote_tracking_branch,remote-tracking branch>> of a remote
152152
<<def_repository,repository>>.
153153

0 commit comments

Comments
 (0)