Module: setup-scripts Branch: oe-core Commit: a2c24b4b8a9a2dc2a4f082a1fcfe62b57aaacb3f
Author: Dmitry Eremin-Solenikov <dbarysh...@gmail.com> Date: Thu Sep 8 14:58:47 2011 +0400 .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 <dbarysh...@gmail.com> Signed-off-by: Koen Kooi <k...@dominion.thruhere.net> --- .gitignore | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df52c76..9e3b776 100644 --- a/.gitignore +++ b/.gitignore @@ -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 - _______________________________________________ Angstrom-distro-devel mailing list Angstrom-distro-devel@linuxtogo.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
