diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:11 -0700 |
commit | b407d40933f9c37af16ca3dc275e615ab4fdd8c5 (patch) | |
tree | a22498a4d0d7d253f43cb2bde8b032b2374b12b2 /bisect.c | |
parent | 2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff) | |
parent | 1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff) | |
download | git-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.gz |
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 'bisect.c')
-rw-r--r-- | bisect.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -21,8 +21,7 @@ static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; static const char *argv_show_branch[] = {"show-branch", NULL, NULL}; static const char *argv_update_ref[] = {"update-ref", "--no-deref", "BISECT_HEAD", NULL, NULL}; -/* bits #0-15 in revision.h */ - +/* Remember to update object flag allocation in object.h */ #define COUNTED (1u<<16) /* |