Merge branch 'ws/rebase-p' into next

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a1d674608a3477da14f4caf426b17aefe82d0dd9..e7e673266e8e2e6fcbe7723c851c6d216eecb84c 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2544,6 +2544,7 @@ static void read_object_list_from_stdin(void)
        }
 }
 
+/* Remember to update object flag allocation in object.h */
 #define OBJECT_ADDED (1u<<20)
 
 static void show_commit(struct commit *commit, void *data)