summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDongcan Jiang <dongcan.jiang@gmail.com>2015-03-11 02:13:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-19 18:07:51 (GMT)
commit695985f4837e7299dca10b5e45206dbd2c52c1e0 (patch)
tree4dc6b51d89a4874c73a66f10b037f51218fee7bc /Documentation
parent9874fca7122563e28d699a911404fc49d2a24f1c (diff)
downloadgit-695985f4837e7299dca10b5e45206dbd2c52c1e0.zip
git-695985f4837e7299dca10b5e45206dbd2c52c1e0.tar.gz
git-695985f4837e7299dca10b5e45206dbd2c52c1e0.tar.bz2
revision: forbid combining --graph and --no-walk
Because "--graph" is about connected history while --no-walk is about discrete points, it does not make sense to allow these two options at the same time. [1] This change makes a few calls to "show --graph" fail in t4052, but asking to show one commit with graph is a nonsensical thing to do. Thus, tests on "show --graph" in t4052 have been removed [2,3]. Same tests on "show" without --graph option have already been tested in 4052. 3 testcases have been added to test this patch. [1]: http://article.gmane.org/gmane.comp.version-control.git/216083 [2]: http://article.gmane.org/gmane.comp.version-control.git/264950 [3]: http://article.gmane.org/gmane.comp.version-control.git/265107 Helped-By: Eric Sunshine <sunshine@sunshineco.com> Helped-By: René Scharfe <l.s.r@web.de> Helped-By: Junio C Hamano <gitster@pobox.com> Signed-off-by: Dongcan Jiang <dongcan.jiang@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rev-list-options.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 2984f40..890775b 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -673,6 +673,7 @@ These options are mostly targeted for packing of Git repositories.
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`.
@@ -775,6 +776,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.
+