Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/builtin-add.c b/builtin-add.c
index 9847b7e019ece82f19e3e5decf8647eb921c4291..3d8b8b4f89514e0a8f7af1c2c7dc2f8ae372129e 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -95,7 +95,7 @@ static void update_callback(struct diff_queue_struct *q,
                const char *path = p->one->path;
                switch (p->status) {
                default:
-                       die("unexpacted diff status %c", p->status);
+                       die("unexpected diff status %c", p->status);
                case DIFF_STATUS_UNMERGED:
                case DIFF_STATUS_MODIFIED:
                case DIFF_STATUS_TYPE_CHANGED: