summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Byrne <james.byrne@origamienergy.com>2014-12-08 15:18:57 (GMT)
committerJames Byrne <james.byrne@origamienergy.com>2014-12-10 16:51:44 (GMT)
commitddf60619bab8566fe668bcf2511a244fc0e7a7a2 (patch)
tree501b6105d8a587453b6a51d55f4fd3a0ba39d4df
parent8ad1b492d3ee8829ba0b8733a82d861f08a594bd (diff)
Update .gitignore files.
The current .gitignore files cause changes to files which are actually part of the repository to be ignored. This commit modifies the rules so that this does not happen. The files that were affected are: config/global/paths.in contrib/gcc-test-suite/Makefile docs/ct-ng.1.in kconfig/Makefile (as revealed by 'git ls-files --ignored --exclude-standard') Signed-off-by: James Byrne <james.byrne@origamienergy.com>
-rw-r--r--.gitignore3
-rw-r--r--docs/.gitignore1
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 90b516d..7854d8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,12 @@ configure
autom4te.cache
config.log
config.status
-Makefile
+/Makefile
*ct-ng*
!ct-ng.comp
!ct-ng.in
paths.*
+!paths.in
config.gen/
.config
.config.2
diff --git a/docs/.gitignore b/docs/.gitignore
index 53f6ef9..fc05ff2 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,2 +1,3 @@
*ct-ng*.1
*ct-ng*.1.gz
+!ct-ng.1.in