From 8597a319de554ee6901b63f442ccc2e826927513 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 12 Mar 2017 18:05:03 +0100 Subject: .gitconfig: Removing ammend alias. Properly setting merge tool to vimdiff. Adding signingkey. --- .gitconfig | 4 ++-- 1 file 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 -- cgit v1.2.3-70-g09d2