diff options
| author | Reuven Y <robi@post.jce.ac.il> | 2021-05-19 09:28:49 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-19 21:11:49 +0900 |
| commit | e22f2daed0fde4595696e09c6802a1ecd5e0c527 (patch) | |
| tree | 0df412190a9d68d24489af21cae57060c6a3d6d3 /Documentation/glossary-content.txt | |
| parent | 48bf2fa8bad054d66bd79c6ba903c89c704201f7 (diff) | |
| download | git-e22f2daed0fde4595696e09c6802a1ecd5e0c527.tar.gz | |
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>
Diffstat (limited to 'Documentation/glossary-content.txt')
| -rw-r--r-- | Documentation/glossary-content.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 67c7a50b96..c077971335 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>>. |