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 /Documentation/rev-list-options.txt | |
| parent | 257b204f2537e50c8c53326d188094203cd3515f (diff) | |
| parent | 695985f4837e7299dca10b5e45206dbd2c52c1e0 (diff) | |
| download | git-dbd04eba01b05baee1c4ff39d00a0d6fd33a912a.tar.gz | |
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 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index e2de7891cb..f620ee4e1c 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -680,6 +680,7 @@ endif::git-rev-list[] given on the command line. Otherwise (if `sorted` or no argument was given), the commits are shown in reverse chronological order by commit time. + Cannot be combined with `--graph`. --do-walk:: Overrides a previous `--no-walk`. @@ -782,6 +783,7 @@ you would get an output like this: on the left hand side of the output. This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly. + Cannot be combined with `--no-walk`. + This enables parent rewriting, see 'History Simplification' below. + |