Merge branch 'jn/format-patch-doc' into maint

diff --git a/builtin/reset.c b/builtin/reset.c
index 1fe5b0f9ef66d70ba8b39291e9b4a6fbebc20f30..98bca044c1267fa63cb084a45aaf621e85f7d9b6 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
  */
-#include "cache.h"
+#include "builtin.h"
 #include "tag.h"
 #include "object.h"
 #include "commit.h"