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 /commit.c | |
| parent | 2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff) | |
| parent | 1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff) | |
| download | git-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.gz git-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.xz | |
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 'commit.c')
| -rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -721,7 +721,7 @@ void sort_in_topological_order(struct commit_list **list, enum rev_sort_order so /* merge-base stuff */ -/* bits #0..15 in revision.h */ +/* Remember to update object flag allocation in object.h */ #define PARENT1 (1u<<16) #define PARENT2 (1u<<17) #define STALE (1u<<18) |