diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 12:38:11 -0700 |
| commit | b407d40933f9c37af16ca3dc275e615ab4fdd8c5 (patch) | |
| tree | a22498a4d0d7d253f43cb2bde8b032b2374b12b2 /Documentation/rev-list-options.txt | |
| parent | 2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff) | |
| parent | 1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff) | |
| download | git-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.gz | |
Merge branch 'nd/log-show-linear-break'
Attempts to show where a single-strand-of-pearls break in "git log"
output.
* nd/log-show-linear-break:
log: add --show-linear-break to help see non-linear history
object.h: centralize object flag allocation
Diffstat (limited to 'Documentation/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 9a3da3646e..b8139610b9 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -758,6 +758,13 @@ This enables parent rewriting, see 'History Simplification' below. This implies the `--topo-order` option by default, but the `--date-order` option may also be specified. +--show-linear-break[=<barrier>]:: + When --graph is not used, all history branches are flattened + which can make it hard to see that the two consecutive commits + do not belong to a linear branch. This option puts a barrier + in between them in that case. If `<barrier>` is specified, it + is the string that will be shown instead of the default one. + ifdef::git-rev-list[] --count:: Print a number stating how many commits would have been |