diff options
| author | Alan Pearce | 2017-05-21 11:14:56 +0200 |
|---|---|---|
| committer | Alan Pearce | 2017-05-21 11:14:56 +0200 |
| commit | 97ac5faeee65e79d49bfa49d321f4d45772d6ec0 (patch) | |
| tree | 00de7207f908fe2acfff88d519c01e761076c4be /git | |
| parent | 8cb99ca85533e3252289e0ccb5ebe1dc8c98fa15 (diff) | |
| parent | 80ff771431d668bff8c73461c606c8f1517752dd (diff) | |
| download | nixfiles-97ac5faeee65e79d49bfa49d321f4d45772d6ec0.tar.lz nixfiles-97ac5faeee65e79d49bfa49d321f4d45772d6ec0.tar.zst nixfiles-97ac5faeee65e79d49bfa49d321f4d45772d6ec0.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'git')
| -rw-r--r-- | git/.config/git/config | 2 | ||||
| -rw-r--r-- | git/.config/git/ignore | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index f3a62f67..c82c149f 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -32,8 +32,6 @@ algorithm = patience [include] path = config.local -[core] - excludesfile = ~/.config/git/ignore [rebase] autosquash = true [rerere] diff --git a/git/.config/git/ignore b/git/.config/git/ignore index d7189dc5..66c652a9 100644 --- a/git/.config/git/ignore +++ b/git/.config/git/ignore @@ -18,6 +18,9 @@ auto-save-list tramp .\#* +# zsh +*.zwc + # Org-mode .org-id-locations *_archive |