X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-merge.txt;h=3ceefb8a1f3b17f4301d89f8eec1cc4bb103a24a;hb=2ef80c2d8998593852be2fb0546c8e4a518a6bf1;hp=e2e6aba17e7bde2bacb7f29ec4c54e5f9587dac6;hpb=fee6bc5f031a9d18d09463d96d7df562d62438f7;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index e2e6aba17..3ceefb8a1 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,7 +9,7 @@ git-merge - Join two or more development histories together
 SYNOPSIS
 --------
 [verse]
-'git merge' [-n] [--stat] [--no-commit] [--squash]
+'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 	[-s <strategy>] [-X <strategy-option>]
 	[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
 'git merge' <msg> HEAD <commit>...