From a91dc9e55778a7b7f536a73439c45e0ad29f870b Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Sun, 1 Jul 2018 04:23:19 +0100
Subject: [PATCH] Document --[no]useask and --[no]combinedupgrade

---
 cmd.go    |  4 ++++
 doc/yay.8 | 35 ++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/cmd.go b/cmd.go
index e2fe6d2d..165c5bd8 100644
--- a/cmd.go
+++ b/cmd.go
@@ -94,6 +94,10 @@ Permanent configuration options:
     --noprovides          Just look for packages by pkgname
     --pgpfetch            Prompt to import PGP keys from PKGBUILDs
     --nopgpfetch          Don't prompt to import PGP keys
+    --useask              Automatically resolce conflicts using pacman's ask flag
+    --nouseask            Confirm conflicts manually during the install
+    --combinedUpgrade     Refresh then perform the repo and AUR upgrade together
+    --nocombinedUpgrade   Perform the repo upgrade and AUR upgrade separately
 
     --sudoloop            Loop sudo calls in the background to avoid timeout
     --nosudoloop          Do not loop sudo calls in the background
diff --git a/doc/yay.8 b/doc/yay.8
index 4a359041..75010690 100644
--- a/doc/yay.8
+++ b/doc/yay.8
@@ -1,5 +1,5 @@
 '\" t
-.TH "YAY" "8" "2018\-06\-04" "Yay v7\&.885+" "Yay Manual"
+.TH "YAY" "8" "2018\-07\-01" "Yay v7\&.887+" "Yay Manual"
 .nh
 .ad l
 .SH "NAME"
@@ -437,6 +437,39 @@ failiure unless using options such as \fB\-\-skippgpcheck\fR or a customized
 gpg config\%.
 .RE
 .PP
+\fB\-\-useask\fR
+.RS 4
+Use pacman's --ask flag to automatically confirm package conflicts\&. Yay lists
+conflicts ahead of time\&. It is possible thay Yay does not detect
+a conflict\&. Causing a package to be removed without the user's confimation\&.
+Although this is very unlikley\&.
+.RE
+.PP
+\fB\-\-nouseask\fR
+.RS 4
+Manually resolve package conflicts during the install. Packages which do not
+conflict will not need to be confimed manually\&.
+.RE
+.PP
+\fB\-\-combinedupgrade\fR
+.RS 4
+During sysupgrade, Yay will first perform a refresh, then show
+its combined menu of repo and AUR packages that will be upgraded\&. Then after
+reviewing the pkgbuilds, the repo and AUR upgrade will start with no need
+for manual intervention\&.
+
+If Yay exits for any reason After the refresh without upgrading\&. It is then
+the user's responsibility to either resolve the reason Yay exited or run
+a sysupgrade through pacman directly\&.
+.RE
+.PP
+\fB\-\-nocombinedupgrade\fR
+.RS 4
+During sysupgrade, Pacman \-Syu will be called, then the AUR upgrade will
+start\&. This means the upgrade menu and pkgbuild review will be performed
+after the sysupgrade has finished\&.
+.RE
+.PP
 \fB\-\-rebuild\fR
 .RS 4
 Always build target packages even when a copy is available in cache\&.