Merge branch 'maint-1.8.5' into maint-1.9

diff --git a/builtin/apply.c b/builtin/apply.c
index b0d0986226ccb7fa06b08bacba6269b8834e8dd6..6013e1913c05a57ed935a17504ebe079f46cc8ad 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4061,7 +4061,7 @@ static int write_out_one_reject(struct patch *patch)
                return error(_("cannot open %s: %s"), namebuf, strerror(errno));
 
        /* Normal git tools never deal with .rej, so do not pretend
-        * this is a git patch by saying --git nor give extended
+        * this is a git patch by saying --git or giving extended
         * headers.  While at it, maybe please "kompare" that wants
         * the trailing TAB and some garbage at the end of line ;-).
         */