From 56fc2fa39983a965fca2b64b512c8e16f95d45b1 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Sun, 12 Jun 2016 16:23:42 -0700
Subject: Update rsyncignore

---
 home/.rsyncignore | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'home/.rsyncignore')

diff --git a/home/.rsyncignore b/home/.rsyncignore
index 3f3bae7..38378cc 100644
--- a/home/.rsyncignore
+++ b/home/.rsyncignore
@@ -1,15 +1,14 @@
 # keep these hidden files and directories
++ /.dotfiles/
++ /.drone/
++ /.emacs.d/
++ /.gitconfig/
++ /.gnupg/
++ /.mutt/
++ /.password-store/
++ /.sbt/
++ /.ssh/
 + /.rsyncignore
-+ /.ssh
-+ /.gnupg
-+ /.password-store
-+ /.sbt
-+ /.mutt
-+ /.emacs.d
-+ /.dotfiles
-+ /.gitconfig
-+ /.gitignore
-+ /.drone
 
 # ignore other hidden files
 - /.*
@@ -18,7 +17,7 @@
 - **~
 
 # ignore files in any .gitignore files
-- : .gitignore
+dir-merge,- .gitignore
 
 # ignore following directories
 - /Downloads
-- 
cgit v1.2.3