git-am: Add am.keepcr and --no-keep-cr to override it

diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt
index 4685a898f153091d2b747bfb204cf0686c6a8f82..1b5f61aa0b85ec592c6efbfa8be08fe83f576be5 100644 (file)
--- a/Documentation/git-remote-helpers.txt
+++ b/Documentation/git-remote-helpers.txt
@@ -25,7 +25,7 @@ Commands are given by the caller on the helper's standard input, one per line.
 
 'capabilities'::
        Lists the capabilities of the helper, one per line, ending
-       with a blank line. Each capability may be preceeded with '*'.
+       with a blank line. Each capability may be preceded with '*'.
        This marks them mandatory for git version using the remote
        helper to understand (unknown mandatory capability is fatal
        error).