summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-11-05 22:52:19 +0100
committerLudovic Courtès <ludo@gnu.org>2018-11-06 00:04:11 +0100
commit5f7dd092ca577a534067f577b8849ed06cabf970 (patch)
tree62ed84557dee7cca142509799efbc2af69466685 /doc
parent7082873ea2771ebef900333e0fa7468d6395f330 (diff)
downloadguix-5f7dd092ca577a534067f577b8849ed06cabf970.tar.gz
pull: Make '--dry-run' behave as expected.
* guix/scripts/pull.scm (show-help): Document '--dry-run'.
(build-and-install): Add #:dry-run? parameter and honor it.
(guix-pull): Remove (assoc-ref opts 'dry-run?) condition.  Instead, pass
it as #:dry-run? to 'build-and-install'.
* doc/guix.texi (Invoking guix pull): Document '--dry-run'.  Move
'--verbose' to the bottom.
Diffstat (limited to 'doc')
-rw-r--r--doc/guix.texi11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 3b7fa50d81..d410f2a550 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -2844,9 +2844,6 @@ The @command{guix pull} command is usually invoked with no arguments,
 but it supports the following options:
 
 @table @code
-@item --verbose
-Produce verbose output, writing build logs to the standard error output.
-
 @item --url=@var{url}
 @itemx --commit=@var{commit}
 @itemx --branch=@var{branch}
@@ -2880,6 +2877,14 @@ current generation only.
 @itemx -p @var{profile}
 Use @var{profile} instead of @file{~/.config/guix/current}.
 
+@item --dry-run
+@itemx -n
+Show which channel commit(s) would be used and what would be built or
+substituted but do not actually do it.
+
+@item --verbose
+Produce verbose output, writing build logs to the standard error output.
+
 @item --bootstrap
 Use the bootstrap Guile to build the latest Guix.  This option is only
 useful to Guix developers.