Merge branch 'mk/combine-diff-context-horizon-fix' into maint

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 70152e8b1eb31e5ed6e7da889a424bc65c1f16c2..f79c9d858301353043fe0878bee268d8eacde189 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -8,7 +8,7 @@ git-revert - Revert some existing commits
 SYNOPSIS
 --------
 [verse]
-'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
+'git revert' [--[no-]edit] [-n] [-m parent-number] [-s] <commit>...
 'git revert' --continue
 'git revert' --quit
 'git revert' --abort