From: Dan Murphy <dmurphy@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [uBoot] [Patch v2 1/4] spl: common: Properly ignore spl/Makefile in .gitignore
Date: Thu, 16 Jan 2014 11:23:28 -0600 [thread overview]
Message-ID: <1389893011-1879-1-git-send-email-dmurphy@ti.com> (raw)
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>
---
v2 - No change just a rebase - http://patchwork.ozlabs.org/patch/309263/
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 3b14c25..7f006c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,8 +57,8 @@
/errlog
/reloc_off
-/spl/
!/spl/Makefile
+/spl/*
/tpl/
/include/generated/
--
1.7.9.5
next reply other threads:[~2014-01-16 17:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-16 17:23 Dan Murphy [this message]
2014-01-16 17:23 ` [U-Boot] [uBoot] [Patch v2 2/4] spl: common: Move FAT funcs to a common file Dan Murphy
2014-01-27 14:56 ` [U-Boot] [U-Boot, v2, " Tom Rini
2014-01-16 17:23 ` [U-Boot] [uBoot] [Patch v2 3/4] spl: common: Support for USB MSD FAT image loading Dan Murphy
2014-01-27 14:56 ` [U-Boot] [U-Boot, v2, " Tom Rini
2014-01-16 17:23 ` [U-Boot] [uBoot] [Patch v2 4/4] arm: am43xx: Add USB spl boot support Dan Murphy
2014-01-27 14:57 ` [U-Boot] [U-Boot,v2,4/4] " Tom Rini
2014-01-20 23:00 ` [U-Boot] [U-Boot, v2, 1/4] spl: common: Properly ignore spl/Makefile in .gitignore Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1389893011-1879-1-git-send-email-dmurphy@ti.com \
--to=dmurphy@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox