diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-05-17 06:43:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-05-17 06:43:34 +0000 |
| commit | 3d050d664ae8d18bd81b2a9283134954e98024a5 (patch) | |
| tree | 162295d648f1c3f73bda2548922ab7c21e5ad634 /git-merge.html | |
| parent | 5397bf085b22da968a5595e44db425de58f163ef (diff) | |
| download | git-htmldocs-3d050d664ae8d18bd81b2a9283134954e98024a5.tar.gz | |
Autogenerated HTML docs for v1.7.5.1-339-gb602ed
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index d6de95fb1..7226632ba 100644 --- a/git-merge.html +++ b/git-merge.html @@ -1139,6 +1139,21 @@ merge.defaultToUpstream </p>
</dd>
<dt class="hdlist1">
+merge.ff
+</dt>
+<dd>
+<p>
+ By default, git does not create an extra merge commit when merging
+ a commit that is a descendant of the current commit. Instead, the
+ tip of the current branch is fast-forwarded. When set to <tt>false</tt>,
+ this variable tells git to create an extra merge commit in such
+ a case (equivalent to giving the <tt>--no-ff</tt> option from the command
+ line). When set to <tt>only</tt>, only such fast-forward merges are
+ allowed (equivalent to giving the <tt>--ff-only</tt> option from the
+ command line).
+</p>
+</dd>
+<dt class="hdlist1">
merge.log
</dt>
<dd>
|