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 /merge-options.txt | |
| parent | 513ff12aa0be31c6bd62cf14564a7beecf971b90 (diff) | |
| download | git-htmldocs-11821ed3cc84929e22aead7e1473a145a9e3f4d2.tar.gz | |
Autogenerated HTML docs for v1.7.7-419-g87009
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index b613d4ed0..6bd0b041c 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -7,6 +7,12 @@ With --no-commit perform the merge but pretend the merge failed and do not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. +--edit:: +-e:: ++ + Invoke editor before committing successful merge to further + edit the default merge message. + --ff:: --no-ff:: Do not generate a merge commit if the merge resolved as |