summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2014-01-16 11:23:28 -0600
committerTom Rini <trini@ti.com>2014-01-20 10:09:51 -0500
commit86a8b3a207ac34f453607a52a4d702bb67789ea2 (patch)
tree4e4eac2d0f195164231b56a86fd4db1b053d9fc2 /.gitignore
parent84977e44eb678a06f70571695ade5f834b29c377 (diff)
spl: common: Properly ignore spl/Makefile in .gitignore
The spl directory is ignored by git as these objects are created during spl creation. The only file not created is the Makefile. This file can be modified and checked in via git. Due to the order of rule precedence having the whole directory ignored first then indicating not to ignore the Makefile is not correct the message to force adding the Makefile is still shown. So reorder the .gitignore for the Makefile and indicate that the Makefile does not need to be ignored first and then indicate everything else in spl should be ignored after wards. Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 97f7db069a6..d7d55383acb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,8 +58,8 @@
/errlog
/reloc_off
-/spl/
!/spl/Makefile
+/spl/*
/tpl/
/include/generated/