Merge early parts from git://ozlabs.org/~paulus/gitk.git

diff --git a/upload-pack.c b/upload-pack.c
index 286a9ed3ea960d07c267f5e2992e63589361f5e9..01de944a0a23f752364de51d7f5a5be6480575e8 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -17,7 +17,7 @@
 
 static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
 
-/* bits #0..7 in revision.h, #8..10 in commit.c */
+/* Remember to update object flag allocation in object.h */
 #define THEY_HAVE      (1u << 11)
 #define OUR_REF                (1u << 12)
 #define WANTED         (1u << 13)