diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-25 14:23:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 14:23:00 -0700 |
commit | ef57d1e09c88d50737fba2120916edde68bb6e1f (patch) | |
tree | 4f890dde208f2201ff4361fe3a83b5ae7451d56b /rev-list-options.txt | |
parent | 322c6244651c408d924f71f73effd8ed833916d3 (diff) | |
download | git-htmldocs-ef57d1e09c88d50737fba2120916edde68bb6e1f.tar.gz |
Autogenerated HTML docs for v2.3.4-315-gbca18
Diffstat (limited to 'rev-list-options.txt')
-rw-r--r-- | rev-list-options.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index 4ed8587c8..f620ee4e1 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -123,7 +123,8 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit). because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits - brought in to your history by such a merge. + brought in to your history by such a merge. Cannot be + combined with --bisect. --not:: Reverses the meaning of the '{caret}' prefix (or lack thereof) @@ -185,7 +186,7 @@ ifndef::git-rev-list[] Pretend as if the bad bisection ref `refs/bisect/bad` was listed and as if it was followed by `--not` and the good bisection refs `refs/bisect/good-*` on the command - line. + line. Cannot be combined with --first-parent. endif::git-rev-list[] --stdin:: @@ -566,7 +567,7 @@ outputs 'midpoint', the output of the two commands would be of roughly the same length. Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length -one. +one. Cannot be combined with --first-parent. --bisect-vars:: This calculates the same as `--bisect`, except that refs in @@ -679,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`. @@ -781,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. + |