X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=1a5c12e3171ab82f489bcd53657c8a89741a3dab;hb=50c94032844bb184cdeff7779be3b6a23e04d312;hp=6bd0b041c3c1c0af5d03fce43d8016706e9256b1;hpb=b76c561a74cd366786b7b762795fba1551b42149;p=git.git diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 6bd0b041c..1a5c12e31 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing. --edit:: -e:: -+ Invoke editor before committing successful merge to further edit the default merge message.