diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 23:38:11 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 23:38:11 +0400 |
| commit | b407d40933f9c37af16ca3dc275e615ab4fdd8c5 (patch) | |
| tree | a22498a4d0d7d253f43cb2bde8b032b2374b12b2 /fetch-pack.c | |
| parent | 2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff) | |
| parent | 1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff) | |
Merge branch 'nd/log-show-linear-break'
Attempts to show where a single-strand-of-pearls break in "git log"
output.
* nd/log-show-linear-break:
log: add --show-linear-break to help see non-linear history
object.h: centralize object flag allocation
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 90d47da8a9..eeee2bb7e0 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -26,6 +26,7 @@ static int agent_supported; static struct lock_file shallow_lock; static const char *alternate_shallow_file; +/* Remember to update object flag allocation in object.h */ #define COMPLETE (1U << 0) #define COMMON (1U << 1) #define COMMON_REF (1U << 2) |