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 /merge-options.txt | |
| parent | 615c3b305d84007474d17c62d54fc18c71fdc587 (diff) | |
| download | git-htmldocs-664750f03dff9b27b2c2fe5381a720967c1b60c1.tar.gz | |
Autogenerated HTML docs for v2.16.2-440-gc6284
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-options.txt b/merge-options.txt index 3888c3ff8..63a3fc095 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -35,7 +35,8 @@ set to `no` at the beginning of them. --no-ff:: 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 'refs/tags/' hierarchy. --ff-only:: Refuse to merge and exit with a non-zero status unless the |