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 <> and you are "merging" another <>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <> - <> but instead just update to his - revision. This will happen frequently on a + <> but instead just update your branch to point at the same + revision as the branch you are merging. This will happen frequently on a <> of a remote <>.