diff options
| author | David Runge <dave@sleepmap.de> | 2017-03-12 18:05:03 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2017-03-12 18:05:03 +0100 |
| commit | 8597a319de554ee6901b63f442ccc2e826927513 (patch) | |
| tree | c33f85e8b13c2b2f0517a989ccefcb5f60d44c71 | |
| parent | 3777d4d8b8f3df6a321ccbb87e98cf5560d850a8 (diff) | |
| download | dotfiles-8597a319de554ee6901b63f442ccc2e826927513.tar.gz dotfiles-8597a319de554ee6901b63f442ccc2e826927513.tar.bz2 dotfiles-8597a319de554ee6901b63f442ccc2e826927513.tar.xz dotfiles-8597a319de554ee6901b63f442ccc2e826927513.zip | |
.gitconfig: Removing ammend alias. Properly setting merge tool to vimdiff. Adding signingkey.
| -rw-r--r-- | .gitconfig | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |