From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Mar 2015 19:54:22 +0000 (-0700)
Subject: Merge branch 'dj/log-graph-with-no-walk'
X-Git-Tag: v2.4.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbd04eba01b05baee1c4ff39d00a0d6fd33a912a;p=thirdparty%2Fgit.git

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
---

dbd04eba01b05baee1c4ff39d00a0d6fd33a912a