Merge branch 'jc/grep' into next

diff --git a/update-index.c b/update-index.c
index 157488ff1a87df262e6177671f5e568b8d155de3..1c1f13bd7044ad78800b4f9faa0ff1b05b9b6c21 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -6,8 +6,8 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "quote.h"
-#include "tree-walk.h"
 #include "cache-tree.h"
+#include "tree-walk.h"
 
 /*
  * Default to not allowing changes to the list of files. The