Merge branch 'dj/log-graph-with-no-walk'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:22 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2015 19:54:22 +0000 (12:54 -0700)
"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

1  2 
Documentation/rev-list-options.txt
revision.c
t/t4202-log.sh
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge