diff --git a/.gitconfig b/.gitconfig
index bb0c466..3fd81a8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -106,12 +106,12 @@
     br = branch -r
     #############
     c = commit
-    ca = commit -a
+    ca = commit --all
     cm = commit -m
     cem = commit --allow-empty -m
     cam = commit -am
     cd = commit --amend
-    cad = commit -a --amend
+    cad = commit --all --amend
     ced = commit --allow-empty --amend
     #############
     d = diff
@@ -147,7 +147,7 @@
     o = checkout
     ob = checkout -b
     #############
-    pr = prune -v
+    pr = prune --verbose
     #############
     ps = push
     psf = push -f
@@ -191,7 +191,7 @@
     r = remote
     ra = remote add
     rr = remote rm
-    rv = remote -v
+    rv = remote --verbose
     rm = remote rename
     rp = remote prune
     rs = remote show
@@ -203,7 +203,7 @@
     rpu = remote prune upstream
     #############
     s = status
-    sb = status -s -b
+    sb = status --signoff -b
     #############
     sa = stash apply
     sc = stash clear
@@ -214,8 +214,8 @@
     sw = stash show
     #############
     w = show
-    wp = show -p
-    wr = show -p --no-color
+    wp = show --patch
+    wr = show --patch --no-color
     #############
     svnr = svn rebase
     svnd = svn dcommit
@@ -231,7 +231,7 @@
     ours = "!f() { git checkout --ours $@ && git add $@; }; f"
     theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
     #############
-    whois = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
+    whois = "!sh -c 'git log --include -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
     whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
     #############
     barebranch = !sh -c 'git symbolic-ref HEAD refs/heads/$1 && git rm --cached -r . && git clean -xfd' -
@@ -244,4 +244,4 @@
     start = !git init && git commit --allow-empty -m \"Initial commit\"
     snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
     # Use to sign an existing git commit. Use: git resign <COMMIT_ID>
-    resign = "!re() { git rebase --exec 'git commit --amend --no-edit -n -S -s' -i $1; }; re"
+    resign = "!re() { git rebase --exec 'git commit --amend --no-edit --no-verify -S --signoff' -i $1; }; re"