Merge branch 'dj/log-graph-with-no-walk'
commitdbd04eba01b05baee1c4ff39d00a0d6fd33a912a
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:22 +0000 (25 12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:22 +0000 (25 12:54 -0700)
tree9db49ea856096dadb87c503cb7e08eea0888456a
parent257b204f2537e50c8c53326d188094203cd3515f
parent695985f4837e7299dca10b5e45206dbd2c52c1e0
Merge branch 'dj/log-graph-with-no-walk'

"git log --graph --no-walk A B..." is a otcnflicting request that
asks nonsense; no-walk tells us show discrete points in the
history, while graph asks to draw connections between these
discrete points. Forbid the combination.

* dj/log-graph-with-no-walk:
  revision: forbid combining --graph and --no-walk
Documentation/rev-list-options.txt
revision.c
t/t4202-log.sh