diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:04:25 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:04:26 +0900 |
| commit | 7f06d94e7292a555ac83ba2c26ea0b5973d94797 (patch) | |
| tree | e54556b0daaf6bbf1876a7aa3e9b7846b9bad225 | |
| parent | e4b5d2a83f8b90cd1e05c6a8bfd71cfc5ce5b45d (diff) | |
| parent | e22f2daed0fde4595696e09c6802a1ecd5e0c527 (diff) | |
| download | git-7f06d94e7292a555ac83ba2c26ea0b5973d94797.tar.gz | |
Merge branch 'ry/clarify-fast-forward-in-glossary'
The description of "fast-forward" in the glossary has been updated.
* ry/clarify-fast-forward-in-glossary:
docs: improve fast-forward in glossary content
| -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>>. |