Merge branch 'nd/log-show-linear-break'
commitb407d40933f9c37af16ca3dc275e615ab4fdd8c5
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 19:38:11 +0000 (3 12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Apr 2014 19:38:11 +0000 (3 12:38 -0700)
treea22498a4d0d7d253f43cb2bde8b032b2374b12b2
parent2b06c1e57eecde25ff762cc12939d8a6d8f143cc
parent1b32decefd840e0ca5d18eefd6472fd8624dd849
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
12 files changed:
Documentation/rev-list-options.txt
bisect.c
builtin/blame.c
bundle.c
commit.c
fetch-pack.c
log-tree.c
object.h
revision.c
revision.h
sha1_name.c
upload-pack.c