Sync with 2.12.5

diff --git a/builtin/commit.c b/builtin/commit.c
index 8d1cac0629e7079daeef57ac049c0c7d7549e6d0..aff6bf7aadc6f5209d5f8fc22dfde055a96214c4 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -984,7 +984,7 @@ static int rest_is_empty(struct strbuf *sb, int start)
        int i, eol;
        const char *nl;
 
-       /* Check if the rest is just whitespace and Signed-of-by's. */
+       /* Check if the rest is just whitespace and Signed-off-by's. */
        for (i = start; i < sb->len; i++) {
                nl = memchr(sb->buf + i, '\n', sb->len - i);
                if (nl)