summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2019-04-01 16:47:06 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2019-04-01 16:47:06 -0400
commit4fcaa1a7d52c8a406fbf7c945a023d480bab32aa (patch)
tree19cf17f225793efdf05bc7f05f33b50b3080642c
parenteeab375796bd7611dd0fc0c28040f2d7594b69f8 (diff)
parent54bdeaab888fb9085e718ef6ac781daa5d629e04 (diff)
downloadjgit-4fcaa1a7d52c8a406fbf7c945a023d480bab32aa.tar.gz
jgit-4fcaa1a7d52c8a406fbf7c945a023d480bab32aa.zip
Merge ".gitignore: remove editor- and OS-specific files"
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3679a3365b..553ecac486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
/.project
/target
-.DS_Store
infer-out
bazel-*
-*~
+
+# Do not add editor- and OS-specific files like *~ (Emacs) and .DS_Store
+# (macOS). Instead, add them to $XDG_CONFIG_HOME/git/ignore
+# (~/.config/git/ignore if $XDG_CONFIG_HOME is not set) or
+# $GIT_DIR/info/exclude. See "git help gitignore" for details.