Merge branch 'eyadsibai-add-gitignore'

jverdeyen · Oct 27, 2014 · 48dd320 · 48dd320
2 parents a7470a3 + 7430ab1
commit 48dd320
Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - Support for IntelliJ IDEA 13 (via @dsager)
 - Support for Pass (via @kykim)
 - Support for Composer (via @fayland)
+- Add .gitignore (via @eyadsibai)
 
 ## Mackup 0.7.4
 

diff --git a/mackup/applications/git.cfg b/mackup/applications/git.cfg
@@ -3,4 +3,4 @@ name = Git
 
 [configuration_files]
 .gitconfig
-.gitignore_global
+.config/git/ignore