diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 15:25:44 -0800 |
| commit | 664750f03dff9b27b2c2fe5381a720967c1b60c1 (patch) | |
| tree | 6960e5a2646c836d9415e1aa4aace2cea9aad4f1 /git-pull.html | |
| parent | 615c3b305d84007474d17c62d54fc18c71fdc587 (diff) | |
| download | git-htmldocs-664750f03dff9b27b2c2fe5381a720967c1b60c1.tar.gz | |
Autogenerated HTML docs for v2.16.2-440-gc6284
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-pull.html b/git-pull.html index 1dbe42cb8..e86f414ff 100644 --- a/git-pull.html +++ b/git-pull.html @@ -904,7 +904,8 @@ set to <code>no</code> at the beginning of them.</p></div> <p>
Create a merge commit even when the merge resolves as a
fast-forward. This is the default behaviour when merging an
- annotated (and possibly signed) tag.
+ annotated (and possibly signed) tag that is not stored in
+ its natural place in <em>refs/tags/</em> hierarchy.
</p>
</dd>
<dt class="hdlist1">
|