Repository: incubator-gobblin
Updated Branches:
  refs/heads/master 44ca63cf7 -> 1fbe7006d


Ignore .shelf directory

This directory is used by Intellij for shelved
files.

Also simplified the .gitignore file by removing
duplicate entries.

Closes #2205 from HappyRay/ignore-shelf-dir


Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/1fbe7006
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/1fbe7006
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/1fbe7006

Branch: refs/heads/master
Commit: 1fbe7006d82c40302d1c0ecd46809717569affd6
Parents: 44ca63c
Author: Ray Yang <[email protected]>
Authored: Thu Dec 14 09:39:15 2017 -0800
Committer: Abhishek Tiwari <[email protected]>
Committed: Thu Dec 14 09:39:15 2017 -0800

----------------------------------------------------------------------
 .gitignore | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/1fbe7006/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3a14b1d..79d09d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,23 @@
 .classpath*
 .project*
 .settings
-.idea
-*.iml
-*.iws
-*.ipr
-*.swp
-*.swo
-*.log
-**/.classpath
-**/.project
-**/.settings
+
+# Intellij related
 **/.idea
 **/*.iml
 **/*.iws
 **/*.ipr
+.shelf/
+
+**/.classpath
+**/.project
+**/.settings
+
 **/*.swp
 **/*.swo
 **/*.log
 */bin
 **/bin
-build/
 **/build/
 .gradle
 **/.gradle

Reply via email to