pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

diff --git a/Documentation/config.txt b/Documentation/config.txt
index efc7e68278a2ae32fa0ebf1efe3bad78fc238743..1a8ddb41c7fff8cce5d2c0a51a9d642e3bf0fd42 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -983,9 +983,10 @@ color.status.<slot>::
        `added` or `updated` (files which are added but not committed),
        `changed` (files which are changed but not added in the index),
        `untracked` (files which are not tracked by Git),
-       `branch` (the current branch), or
+       `branch` (the current branch),
        `nobranch` (the color the 'no branch' warning is shown in, defaulting
-       to red).
+       to red), or
+       `unmerged` (files which have unmerged changes).
 
 color.ui::
        This variable determines the default value for variables such