[NBP web-reskin] 13 files updated in git, camp update required
swdidomenico at comcast.net
swdidomenico at comcast.net
Sun Nov 8 11:35:57 EST 2009
All developers, please do a git pull and update you camps.
Below is my log of today's git. For some reason my /pages/index.html were ready for a commit and then it was removed. I don't understand this. I added 14 files. 1 template, 6 html files, and 7 jpg image files. Prior to the git push I did a git status and /pages/index.html was not in the list. Maybe it was the same and I did not change it like I thought. Oh well.
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: ../programs/cbbc/index.html
# modified: ../publications/index.html
# modified: ../support/index.html
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../../htdocs/nbp/images/bookstore.jpg
# ../../../../htdocs/nbp/images/business.jpg
# ../../../../htdocs/nbp/images/education.jpg
# ../../../../htdocs/nbp/images/giving.jpg
# ../../../../htdocs/nbp/images/press.jpg
# ../../../../htdocs/nbp/images/programs.jpg
# ../../../../htdocs/nbp/images/technology.jpg
[fidelity_camp at tp6 education]$ help cd
cd: cd [-L|-P] [dir]
Change the current directory to DIR. The variable $HOME is the
default DIR. The variable CDPATH defines the search path for
the directory containing DIR. Alternative directory names in CDPATH
are separated by a colon (:). A null directory name is the same as
the current directory, i.e. `.'. If DIR begins with a slash (/),
then CDPATH is not used. If the directory is not found, and the
shell option `cdable_vars' is set, then try the word as a variable
name. If that variable has a value, then cd to the value of that
variable. The -P option says to use the physical directory structure
instead of following symbolic links; the -L option forces symbolic links
to be followed.
[fidelity_camp at tp6 education]$ cd camp29
-bash: cd: camp29: No such file or directory
[fidelity_camp at tp6 education]$ cd /camp29
-bash: cd: /camp29: No such file or directory
[fidelity_camp at tp6 education]$ cd
[fidelity_camp at tp6 ~]$ cd catalogs
-bash: cd: catalogs: No such file or directory
[fidelity_camp at tp6 ~]$ cd catalogs
-bash: cd: catalogs: No such file or directory
[fidelity_camp at tp6 ~]$ cd camp29
[fidelity_camp at tp6 camp29]$ cd caralogs
-bash: cd: caralogs: No such file or directory
[fidelity_camp at tp6 camp29]$ cd catalogs
[fidelity_camp at tp6 catalogs]$ cd nbp
[fidelity_camp at tp6 nbp]$ cd pages
[fidelity_camp at tp6 pages]$ cd programs
[fidelity_camp at tp6 programs]$ cd cbbc
[fidelity_camp at tp6 cbbc]$ git add index.html
[fidelity_camp at tp6 cbbc]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: ../../business/index.html
# modified: ../../education/index.html
# modified: index.html
# modified: ../../../templates/regions/TITLE
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: ../../publications/index.html
# modified: ../../support/index.html
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../../../htdocs/nbp/images/bookstore.jpg
# ../../../../../htdocs/nbp/images/business.jpg
# ../../../../../htdocs/nbp/images/education.jpg
# ../../../../../htdocs/nbp/images/giving.jpg
# ../../../../../htdocs/nbp/images/press.jpg
# ../../../../../htdocs/nbp/images/programs.jpg
# ../../../../../htdocs/nbp/images/technology.jpg
[fidelity_camp at tp6 cbbc]$ cd ../
[fidelity_camp at tp6 programs]$ cd ../
[fidelity_camp at tp6 pages]$ cd publications
[fidelity_camp at tp6 publications]$ git index.html
git: 'index.html' is not a git-command. See 'git --help'.
[fidelity_camp at tp6 publications]$ git add index.html
[fidelity_camp at tp6 publications]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: ../business/index.html
# modified: ../education/index.html
# modified: ../programs/cbbc/index.html
# modified: index.html
# modified: ../../templates/regions/TITLE
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: ../support/index.html
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../../htdocs/nbp/images/bookstore.jpg
# ../../../../htdocs/nbp/images/business.jpg
# ../../../../htdocs/nbp/images/education.jpg
# ../../../../htdocs/nbp/images/giving.jpg
# ../../../../htdocs/nbp/images/press.jpg
# ../../../../htdocs/nbp/images/programs.jpg
# ../../../../htdocs/nbp/images/technology.jpg
[fidelity_camp at tp6 publications]$ cd ../
[fidelity_camp at tp6 pages]$ cd support
[fidelity_camp at tp6 support]$ git add index.html
[fidelity_camp at tp6 support]$ cd ../
[fidelity_camp at tp6 pages]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: business/index.html
# modified: education/index.html
# modified: programs/cbbc/index.html
# modified: publications/index.html
# modified: support/index.html
# modified: ../templates/regions/TITLE
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../htdocs/nbp/images/bookstore.jpg
# ../../../htdocs/nbp/images/business.jpg
# ../../../htdocs/nbp/images/education.jpg
# ../../../htdocs/nbp/images/giving.jpg
# ../../../htdocs/nbp/images/press.jpg
# ../../../htdocs/nbp/images/programs.jpg
# ../../../htdocs/nbp/images/technology.jpg
[fidelity_camp at tp6 pages]$ cd ../
[fidelity_camp at tp6 nbp]$ cd ../
[fidelity_camp at tp6 catalogs]$ cd ../
[fidelity_camp at tp6 camp29]$ dir
bin catalogs cgi-bin htdocs httpd interchange pgsql tmp
[fidelity_camp at tp6 camp29]$ cd htdocs
[fidelity_camp at tp6 htdocs]$ cd nbp
[fidelity_camp at tp6 nbp]$ cd images
[fidelity_camp at tp6 images]$ git add bookstore.jpg
[fidelity_camp at tp6 images]$ git add business.jpg
[fidelity_camp at tp6 images]$ git add education.jpg
[fidelity_camp at tp6 images]$ git add giving.jpg
[fidelity_camp at tp6 images]$ git add press.jpg
[fidelity_camp at tp6 images]$ git add programs.jpg
[fidelity_camp at tp6 images]$ git add technology.jpg
[fidelity_camp at tp6 images]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: ../../../catalogs/nbp/pages/business/index.html
# modified: ../../../catalogs/nbp/pages/education/index.html
# modified: ../../../catalogs/nbp/pages/programs/cbbc/index.html
# modified: ../../../catalogs/nbp/pages/publications/index.html
# modified: ../../../catalogs/nbp/pages/support/index.html
# modified: ../../../catalogs/nbp/templates/regions/TITLE
# new file: bookstore.jpg
# new file: business.jpg
# new file: education.jpg
# new file: giving.jpg
# new file: press.jpg
# new file: programs.jpg
# new file: technology.jpg
#
[fidelity_camp at tp6 images]$ cd ../
[fidelity_camp at tp6 nbp]$ cd ../
[fidelity_camp at tp6 htdocs]$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: ../catalogs/nbp/pages/business/index.html
# modified: ../catalogs/nbp/pages/education/index.html
# modified: ../catalogs/nbp/pages/programs/cbbc/index.html
# modified: ../catalogs/nbp/pages/publications/index.html
# modified: ../catalogs/nbp/pages/support/index.html
# modified: ../catalogs/nbp/templates/regions/TITLE
# new file: nbp/images/bookstore.jpg
# new file: nbp/images/business.jpg
# new file: nbp/images/education.jpg
# new file: nbp/images/giving.jpg
# new file: nbp/images/press.jpg
# new file: nbp/images/programs.jpg
# new file: nbp/images/technology.jpg
#
[fidelity_camp at tp6 htdocs]$ git commit
[master f25fa5a] Steve DiDomenico 11/08/09 11:30am - 1 template, 6 html files, and 7 images. All for the top of the page using template called TITLE.
13 files changed, 114 insertions(+), 637 deletions(-)
rewrite catalogs/nbp/pages/business/index.html (99%)
rewrite catalogs/nbp/pages/education/index.html (99%)
rewrite catalogs/nbp/pages/programs/cbbc/index.html (99%)
rewrite catalogs/nbp/pages/publications/index.html (99%)
rewrite catalogs/nbp/pages/support/index.html (99%)
create mode 100644 htdocs/nbp/images/bookstore.jpg
create mode 100644 htdocs/nbp/images/business.jpg
create mode 100644 htdocs/nbp/images/education.jpg
create mode 100644 htdocs/nbp/images/giving.jpg
create mode 100644 htdocs/nbp/images/press.jpg
create mode 100644 htdocs/nbp/images/programs.jpg
create mode 100644 htdocs/nbp/images/technology.jpg
[fidelity_camp at tp6 htdocs]$ git push
To /home/camp/reskin/nbp.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '/home/camp/reskin/nbp.git'
[fidelity_camp at tp6 htdocs]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)
[fidelity_camp at tp6 htdocs]$ git pull
remote: Counting objects: 29, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 16 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
>From /home/camp/reskin/nbp
b841a8b..a3d2412 master -> origin/master
Merge made by recursive.
catalogs/nbp/pages/homepage.html | 93 +++++++++++++++++++++++++-------------
htdocs/nbp/StylesNew.css | 43 +++++++++++++++---
htdocs/nbp/images/donate.jpg | Bin 0 -> 9874 bytes
3 files changed, 99 insertions(+), 37 deletions(-)
create mode 100644 htdocs/nbp/images/donate.jpg
[fidelity_camp at tp6 htdocs]$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
nothing to commit (working directory clean)
[fidelity_camp at tp6 htdocs]$
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.nbp.org/pipermail/web-reskin/attachments/20091108/834209dd/attachment-0001.html
More information about the Web-reskin
mailing list