diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:53:56 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-10 12:53:56 +0900 |
| commit | 37c77fd2893de182d484f65cca6ba011fe633019 (patch) | |
| tree | d0d7faa8ef69c255ae158f80754e3ee1b15fec90 /glossary-content.txt | |
| parent | 7cac38b31559760e4baa97b11aa0356cc96485d4 (diff) | |
| download | git-htmldocs-37c77fd2893de182d484f65cca6ba011fe633019.tar.gz | |
Autogenerated HTML docs for v2.32.0-29-g211ec
Diffstat (limited to 'glossary-content.txt')
| -rw-r--r-- | glossary-content.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index 67c7a50b9..c07797133 100644 --- a/glossary-content.txt +++ b/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>>. |