diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 16:24:30 -0700 |
| commit | 778a3411f5a5c0dd8a7a6bb51c9451590ad706cb (patch) | |
| tree | c10dd41f6ceecd0a2692f5d2694cb2e9b660f331 /git-pull.html | |
| parent | 09cfe6f8345e8ab347de8af492c34b5850b9b409 (diff) | |
| download | git-htmldocs-778a3411f5a5c0dd8a7a6bb51c9451590ad706cb.tar.gz | |
Autogenerated HTML docs for v1.8.2-279-g631bc
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 0feee6584..8bfd708b6 100644 --- a/git-pull.html +++ b/git-pull.html @@ -902,7 +902,8 @@ set to <code>no</code> at the beginning of them.</p></div> <dd>
<p>
Create a merge commit even when the merge resolves as a
- fast-forward.
+ fast-forward. This is the default behaviour when merging an
+ annotated (and possibly signed) tag.
</p>
</dd>
<dt class="hdlist1">
|