diff --git a/.gitaliases b/.gitaliases
index 8ae5049..5357ac0 100644
--- a/.gitaliases
+++ b/.gitaliases
@@ -31,7 +31,10 @@
   diffs = diff --staged
   fa = fetch --all
   fo = fetch origin
+  fpush = push --force-with-lease
   fup = fetch upstream
+  gon = !git fup && git comn && git usyncn
+  gor = !git fup && git comr && git usyncr
   graph = log --pretty=format:\"%h %s\" --graph
   osync = !echo 'ERROR: use osyncr for master, and osyncm for main.'
   osyncn = rebase origin/main
@@ -40,6 +43,8 @@
   pon = push origin main
   por = push origin master
   prod = !git checkout prod && git rebase origin/master && git push origin prod && git checkout master
+  spop = stash pop
+  sshow = show --show-signature
   st = status
   staash = stash -a
   usync = !echo 'ERROR: use usyncr for master, and usyncn for main.'
diff --git a/default.gitconfig b/default.gitconfig
index a3c9bb0..c478e34 100644
--- a/default.gitconfig
+++ b/default.gitconfig
@@ -36,8 +36,8 @@
   defaultBranch = master
 [log]
   date = iso8601
-[pretty]
-  show = fuller
+[push]
+  gpgSign = if-asked
 [rerere]
   enabled = true
   autoUpdate = true
@@ -48,5 +48,6 @@
   smtpencryption = ssl
   smtpserverport = 465
   smtpAuth = 'PLAIN'
+  smtpReloginDelay = 60
 [tag]
   forceSignAnnotated = true