Permalink
Browse files

.gitignore: unignore sources/layers.txt

Explicitly unignore sources/layers.txt in .gitignre to let git know that
we care about that file. E.g. this fixes problems when merging that file
after a git commit or a git stash pop.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 99980a8 commit a2c24b4b8a9a2dc2a4f082a1fcfe62b57aaacb3f @lumag lumag committed with koenkooi Sep 8, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 .gitignore
View
@@ -1,5 +1,6 @@
build
-sources
+sources/*
+!sources/layers.txt
conf/auto.conf
conf/bblayers.conf
conf/sanity_info
@@ -10,4 +11,3 @@ subversion_config/
package-depends.dot
pn-depends.dot
task-depends.dot
-

0 comments on commit a2c24b4

Please sign in to comment.