From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/dbd04eba01b05baee1c4ff39d00a0d6fd33a912a 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