diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
| commit | dbd04eba01b05baee1c4ff39d00a0d6fd33a912a (patch) | |
| tree | 9db49ea856096dadb87c503cb7e08eea0888456a /xdiff/xmerge.c | |
| parent | Merge branch 'kd/rev-list-bisect-first-parent' (diff) | |
| parent | revision: forbid combining --graph and --no-walk (diff) | |
| download | tgif-dbd04eba01b05baee1c4ff39d00a0d6fd33a912a.tar.xz | |
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
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions