rebase: add a config option to default to --reschedule-failed-exec

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index c4467ffb98a95fa6bb5dc86a92dee3317be9c0ea..d9f422d5600af6b112eba692d5c5607cdb4169ef 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -106,7 +106,7 @@ It is optional: it defaults to 'traditional'.
 The possible options are:
 +
        - 'traditional' - Shows ignored files and directories, unless
-                         --untracked-files=all is specifed, in which case
+                         --untracked-files=all is specified, in which case
                          individual files in ignored directories are
                          displayed.
        - 'no'          - Show no ignored files.