gistfile1.txt

# I did a 
laptop$ git push everyonedelivers.com:/var/www/everyonedelivers.com/rails/.git master
[worked fine]

problem is, the commits are showing up under "Changes to be committed", 
but i already committed them on the laptop. what do i do now?

server$ git status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   app/controllers/deliveries_controller.rb
#	deleted:    app/models/comment.rb
#	modified:   app/models/delivery.rb
#	new file:   app/models/mailer.rb
#	modified:   app/views/deliveries/edit.html.erb
#	modified:   app/views/deliveries/show.html.erb
#	deleted:    db/migrate/20111004010538_create_comments.rb
#	modified:   db/schema.rb
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	modified:   db/schema.rb
#	deleted:    public/500.html
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	config/unicorn.conf
#	github-pull.sh
#	public/50x.html
#	public/assets/
#	public/comic.jpg
#	public/comic/
#	public/version
#	public/whiffiesposter.pdf
#	script/hourly.sh
donp@donpdonp:~/everyonedelivers$