summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-10-19 14:29:33 -0700
committerGitHub <[email protected]>2016-10-19 14:29:33 -0700
commit9d70aec6fde90112b5b5610ab5c17b6883b97063 (patch)
treee1f2b4f10b4ce0bf60bb0e2d9133d9755686d2a7
parent6078881aa18a45ea065a887e2a8606279cdc0329 (diff)
Update .gitignore
Two additional files were recently introduced and should be ignored by git. Signed-off-by: Brian Behlendorf <[email protected]> Closes #5299
-rw-r--r--.gitignore1
-rw-r--r--contrib/dracut/90zfs/.gitignore1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 6cabe62f3..9bdb57abd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ Makefile.in
!.gitignore
tags
TAGS
+current
cscope.*
*.rpm
*.deb
diff --git a/contrib/dracut/90zfs/.gitignore b/contrib/dracut/90zfs/.gitignore
index 098a7510e..85818bb3d 100644
--- a/contrib/dracut/90zfs/.gitignore
+++ b/contrib/dracut/90zfs/.gitignore
@@ -3,4 +3,5 @@ module-setup.sh
mount-zfs.sh
parse-zfs.sh
zfs-generator.sh
+zfs-needshutdown.sh
zfs-lib.sh