aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitconfig b/.gitconfig
index e5628d6..949669e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -31,7 +31,6 @@
ca = commit -am # commit all with message
ci = commit # commit
amend = commit --amend # ammend your last commit
- ammend = commit --amend # ammend your last commit
# checkout
co = checkout # checkout
@@ -99,7 +98,7 @@
[merge]
summary = true
verbosity = 1
- tool = mvimdiff
+ tool = vimdiff
[apply]
whitespace = nowarn
[branch]
@@ -125,3 +124,4 @@
[user]
email = dave@sleepmap.de
name = David Runge
+ signingkey = F5A1A949