diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-19 11:42:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 11:42:09 -0700 |
| commit | 11821ed3cc84929e22aead7e1473a145a9e3f4d2 (patch) | |
| tree | c20abe3330684f3deb12a07e0a967cc02774f856 /git-merge.html | |
| parent | 513ff12aa0be31c6bd62cf14564a7beecf971b90 (diff) | |
| download | git-htmldocs-11821ed3cc84929e22aead7e1473a145a9e3f4d2.tar.gz | |
Autogenerated HTML docs for v1.7.7-419-g87009
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index 426cf144a..6d0029174 100644 --- a/git-merge.html +++ b/git-merge.html @@ -650,6 +650,19 @@ failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing.</p></div>
</dd>
<dt class="hdlist1">
+--edit
+</dt>
+<dt class="hdlist1">
+-e
+</dt>
+<dd>
+<div class="literalblock">
+<div class="content">
+<pre><tt>Invoke editor before committing successful merge to further
+edit the default merge message.</tt></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
--ff
</dt>
<dt class="hdlist1">
|