mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
docs: improve fast-forward in glossary content
The text was somewhat confusing between the revision itself and the author. Signed-off-by: Reuven Yagel <robi@post.jce.ac.il> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
48bf2fa8ba
commit
e22f2daed0
|
@ -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>>.
|
||||
|
||||
|
|
Loading…
Reference in a new issue