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

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc bisect.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc bundle.c
Simple merge

diff --cc commit.c
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc log-tree.c
Simple merge

diff --cc object.h
Simple merge

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge

diff --cc sha1_name.c
Simple merge

diff --cc upload-pack.c
Simple merge