diff options
| author | David Runge <dave@sleepmap.de> | 2017-03-12 18:20:19 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2017-03-12 18:20:19 +0100 |
| commit | 51deebf6ecf6bd6caf1db70ce04034ace0a91d7f (patch) | |
| tree | f3e6956d6b6e916c689f3b3711de3e26be93a3a6 /.gitignore | |
| parent | f35b1721edc62b127be2911e140a40ee2f149ae0 (diff) | |
| parent | b5bcb362e3706a1bfddb92b0092f85a2bee0c433 (diff) | |
| download | dotfiles-51deebf6ecf6bd6caf1db70ce04034ace0a91d7f.tar.gz dotfiles-51deebf6ecf6bd6caf1db70ce04034ace0a91d7f.tar.bz2 dotfiles-51deebf6ecf6bd6caf1db70ce04034ace0a91d7f.tar.xz dotfiles-51deebf6ecf6bd6caf1db70ce04034ace0a91d7f.zip | |
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles:
.gitignore: Adding further gnupg ignores and the high priority .gitconfig git configuration file (for local overrides).
.config/git/config: Removing personalizing git user information.
.config/git/config: Moving to config to lower priority location.
.gitconfig: Removing ammend alias. Properly setting merge tool to vimdiff. Adding signingkey.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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* |