git: remove alises in favor of new gitconfig

1 files changed, 3 insertions, 4 deletions

diff --git a/.gitconfig b/.gitconfig
index 5383981..dc17514 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -24,9 +24,6 @@
     l = log --graph --abbrev-commit --date=relative
 
     st = status -sb
-    ci = commit -v
-    co = checkout
-    fm = merge --ff-only
     rv = remote -v
 
     in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})"
@@ -76,6 +73,7 @@
 
 [merge]
     tool = vimdiff
+    ff = only
 
 [rerere]
     enabled = true
@@ -107,7 +105,8 @@
 [clean]
         requireForce = false
 
-#[commit]
+[commit]
+    verbose = true
 #    gpgsign = true
 #
 #[tag]