[racket-dev] Need a little git help

Well, either add and commit the changes to the images, or checkout the old
versions.  Either way will put git back in a state where it is willing to
push, pull, and merge.

On Aug 5, 2010 1:02 PM, "Jens Axel Søgaard" <jensaxel at soegaard.net> wrote:

2010/8/5 Carl Eastlund <cce at ccs.neu.edu>:

> What does "git status" currently tell you?
See below.

It seems the images in

   collects/teachpack/2htdp/scribblings/img/

are tracked by git, which means that they are not generated
automatically (I thought they were).

I am still a little unsure how to proceed. Any advice?

/Jens Axel

80:plt soegaard$ /usr/local/git/bin/git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 11 different commit(s) each, respectively.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       new file:   collects/teachpack/triangle-xxx.png
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
#       modified:   collects/teachpack/2htdp/scribblings/image-toc.rkt
#       deleted:    collects/teachpack/2htdp/scribblings/img/2353974cf1b.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/24b86203f5.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2751bdfe579.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2a03b18c0c.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2bed4c99df8.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2c15acb26ba.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2c93aecb2b5.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/2c98838ff0.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/8aebbc110e.png
#       deleted:    collects/teachpack/2htdp/scribblings/img/f488ae4f9e.png
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#       collects/teachpack/2htdp/scribblings/image.html
#       collects/teachpack/2htdp/scribblings/img/11f41037210.png
#       collects/teachpack/2htdp/scribblings/img/16c877168cb.png
#       collects/teachpack/2htdp/scribblings/img/185481b843d.png
#       collects/teachpack/2htdp/scribblings/img/1aea72997cc.png
#       collects/teachpack/2htdp/scribblings/img/1c2ca686e5c.png
#       collects/teachpack/2htdp/scribblings/img/1ce2f057282.png
#       collects/teachpack/2htdp/scribblings/img/206013002a2.png
#       collects/teachpack/2htdp/scribblings/img/2271196b15b.png
#       collects/teachpack/2htdp/scribblings/img/22fbf40600e.png
#       collects/teachpack/2htdp/scribblings/img/28083dbe539.png
#       collects/teachpack/2htdp/scribblings/img/28fbf34134c.png
#       collects/teachpack/2htdp/scribblings/img/292cf6346d5.png
#       collects/teachpack/2htdp/scribblings/img/2a3953f3712.png
#       collects/teachpack/2htdp/scribblings/img/2a876662e0e.png
#       collects/teachpack/2htdp/scribblings/img/2d67c4219ef.png
#       collects/teachpack/2htdp/scribblings/img/3a33de5a32.png
#       collects/teachpack/2htdp/scribblings/img/3c0f55df6a.png
#       collects/teachpack/2htdp/scribblings/img/6f8f1b6543.png
#       collects/teachpack/2htdp/scribblings/img/e2d39b3ee5.png
#       collects/teachpack/2htdp/scribblings/img/e2d39b92b5.png
#       collects/teachpack/2htdp/scribblings/img/eb983f1874.png
#       collects/teachpack/2htdp/scribblings/racket.css
#       collects/teachpack/2htdp/scribblings/scribble-common.js
#       collects/teachpack/2htdp/scribblings/scribble-style.css
#       collects/teachpack/2htdp/scribblings/scribble.css
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.racket-lang.org/dev/archive/attachments/20100805/68209f21/attachment.html>