Re: [Angstrom-devel] [PATCH 1/2] .gitignore: unignore sources/layers.txt

2011-09-20 Thread Koen Kooi
Op 8 sep. 2011, om 12:58 heeft Dmitry Eremin-Solenikov het volgende geschreven: > 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

[Angstrom-devel] [PATCH 1/2] .gitignore: unignore sources/layers.txt

2011-09-08 Thread Dmitry Eremin-Solenikov
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 --- .gitignore |4 ++-- 1 files changed, 2 insertions(+), 2 deletion