rebase: Support preserving merges in non-interactive mode

diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index 1b0d7829f0de0776148400632f39d47dd9d19a43..41cbf9c0819872a322321455b8a5cb805efcc26b 100644 (file)
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -57,7 +57,7 @@ OPTIONS
 
 --exec=<git-upload-archive>::
        Used with --remote to specify the path to the
-       git-upload-archive executable on the remote side.
+       'git-upload-archive' on the remote side.
 
 <tree-ish>::
        The tree or commit to produce an archive for.