summaryrefslogtreecommitdiff
path: root/.mrconfig.in
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-03-16 10:36:12 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-03-16 15:30:03 -0700
commitab682898b7bf9731b31aa2b13244297ca4a84985 (patch)
treec145901ca3ce3a8a215033c582cb020c2c296ae2 /.mrconfig.in
parenta8094c459eb67d81d5a8b476c79452d4d53ffb44 (diff)
downloaddotfiles-ab682898b7bf9731b31aa2b13244297ca4a84985.tar.gz
suppress editing merge message for ~/doc pulls
Diffstat (limited to '.mrconfig.in')
-rw-r--r--.mrconfig.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mrconfig.in b/.mrconfig.in
index 256707ad..b1c1bcf0 100644
--- a/.mrconfig.in
+++ b/.mrconfig.in
@@ -699,7 +699,7 @@ skip = ! [ -e "$HOME/local/auth/fmailsyncpass" ]
[doc]
checkout = git clone demeterp:doc doc
-update = git pull "$@"
+update = git pull --no-edit "$@"
skip = ! mine
# set file modification times to last commit for deft.el
@@ -712,7 +712,7 @@ pre_update = win32 || doccheckin
autoci = doccheckin || true
# quick syncs
-sync = doccheckin && git pull && git push
+sync = doccheckin && git --no-edit pull && git push
# --- static websites on web host boxes