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 /user-manual.html | |
| parent | 7cac38b31559760e4baa97b11aa0356cc96485d4 (diff) | |
| download | git-htmldocs-37c77fd2893de182d484f65cca6ba011fe633019.tar.gz | |
Autogenerated HTML docs for v2.32.0-29-g211ec
Diffstat (limited to 'user-manual.html')
| -rw-r--r-- | user-manual.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user-manual.html b/user-manual.html index 90da315bf..676562d3d 100644 --- a/user-manual.html +++ b/user-manual.html @@ -2113,8 +2113,8 @@ current branch integrates with) obviously do not work, as there is no <a class="link" href="#def_revision">revision</a> and you are "merging" another <a class="link" href="#def_branch">branch</a>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <a class="link" href="#def_merge">merge</a> - <a class="link" href="#def_commit">commit</a> but instead just update to his - revision. This will happen frequently on a + <a class="link" href="#def_commit">commit</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 <a class="link" href="#def_remote_tracking_branch">remote-tracking branch</a> of a remote <a class="link" href="#def_repository">repository</a>. </dd><dt><span class="term"> |