diff options
| -rw-r--r-- | .config/git/config (renamed from .gitconfig) | 6 | ||||
| -rw-r--r-- | .gitignore | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.gitconfig b/.config/git/config index e5628d6..5aae96f 100644 --- a/.gitconfig +++ b/.config/git/config @@ -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] @@ -122,6 +121,3 @@ # Remember my merges # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/ enabled = true -[user] - email = dave@sleepmap.de - name = David Runge @@ -198,12 +198,16 @@ svn/ .gem/ .gemrc .gimp-2.8/ +.gitconfig .gnaural/ .gnome2/ .gnupg/gpg.conf .gnupg/.* .gnupg/pubring* +.gnupg/secring* +.gnupg/tofu.db .gnupg/trustdb* +.gnupg/trustlist.txt .gnupg/private*/ .gnupg/crls.d/ .gnupg/random* |