Merge branch 'master' into next

diff --git a/update-index.c b/update-index.c
index 4c6bcfaedd6cd6bb53c0d783ef49fcd24b191850..061b18c1a568539cbaf2dae3e80c479fe06df2d8 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -8,7 +8,6 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
-#include "cache-tree.h"
 
 /*
  * Default to not allowing changes to the list of files. The
@@ -486,7 +485,7 @@ static void read_index_info(int line_termination)
 }
 
 static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>...";
 
 static unsigned char head_sha1[20];
 static unsigned char merge_head_sha1[20];