summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-05-31 15:04:07 (EDT)
committer Francis Rowe <info@gluglug.org.uk>2015-05-31 15:04:07 (EDT)
commitb061bd5b442d84a1c6b0c090ba454770df2de81d (patch)
tree671cc7387c737c2198eb65bdf5c94ff7acbc227f
parentd1244f666507e321c0a697fd9f5bff026d599a93 (diff)
downloadlibreboot.org-b061bd5b442d84a1c6b0c090ba454770df2de81d.zip
libreboot.org-b061bd5b442d84a1c6b0c090ba454770df2de81d.tar.gz
libreboot.org-b061bd5b442d84a1c6b0c090ba454770df2de81d.tar.bz2
update gitignore
-rw-r--r--.gitignore1
-rw-r--r--README.txt10
2 files changed, 1 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index ce9bfde..7fad1f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/site/trisquel/
/site/trisquel
/push
+/pull
diff --git a/README.txt b/README.txt
index 7c1c6c7..0072d6f 100644
--- a/README.txt
+++ b/README.txt
@@ -7,28 +7,18 @@ Just have a look at this output for a rough idea (it's from the site/ directory)
$ ls -lh
total 52K
-drwxr-xr-x 3 fchmmr fchmmr 4.0K May 17 16:59 ccsource
drwxr-xr-x 2 fchmmr fchmmr 4.0K May 15 13:46 contrib
drwxr-xr-x 2 fchmmr fchmmr 4.0K May 22 08:55 css
lrwxrwxrwx 1 fchmmr fchmmr 27 Apr 5 03:58 docs -> ../../lbdev/libreboot/docs/
drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 download
-rw-r--r-- 1 fchmmr fchmmr 1.2K May 23 20:35 footer.php
-rw-r--r-- 1 fchmmr fchmmr 1.3K May 15 13:02 functions.php
-lrwxrwxrwx 1 fchmmr fchmmr 30 Apr 5 03:57 git -> ../../lbdev/libreboot/release/
-drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 github
-drwxr-xr-x 2 fchmmr fchmmr 4.0K May 23 20:33 gitorious
-rw-r--r-- 1 fchmmr fchmmr 3.9K May 23 20:33 index.php
-lrwxrwxrwx 1 fchmmr fchmmr 49 Apr 5 03:59 libreboot.git -> ../../lbdev/libreboot.org_addition/libreboot.git/
-lrwxrwxrwx 1 fchmmr fchmmr 53 Apr 5 03:58 libreboot.org.git -> ../../lbdev/libreboot.org_addition/libreboot.org.git/
drwxr-xr-x 2 fchmmr fchmmr 4.0K May 19 21:53 logo
-lrwxrwxrwx 1 fchmmr fchmmr 13 Apr 11 23:30 lp2014 -> ../../lp2014/
-lrwxrwxrwx 1 fchmmr fchmmr 13 Apr 5 03:59 lp2015 -> ../../lp2015/
-lrwxrwxrwx 1 fchmmr fchmmr 14 Apr 5 03:58 release -> ../../archive/lb/
-rw-r--r-- 1 fchmmr fchmmr 24 Apr 5 04:16 robots.txt
-rw-r--r-- 1 fchmmr fchmmr 4.5K May 23 20:35 variables.php
(notice how anything not part of the git repository, i.e. in .gitignore, is a symlink to some place outside this git clone)
-(notice also that the repository that this clone is from, is stored *inside* this clone and in the .gitignore)
This document is....
Copyright 2015 Francis Rowe <info@gluglug.org.uk>