Archive for March, 2010

Adorable Death and Destruction

Wednesday, March 31st, 2010

Red says:

This week, Patch and I both have individual video-games going, as well as a co-op.  All three are utterly cute, in their own fashions, and all three manage to embody doom and gloom in a delightfully chipper way. (more…)

Emacs and Git with Magit

Tuesday, March 30th, 2010

Patch says:

If you’re like me, you program and/or write in Emacs, and you used Subversion for version control until you discovered Git (or Mercurial — but this article is about Git ;-p), and now you want something like an svn-status buffer, but for your new shiny version control system.  Hooray, you’ve stumbled across this blog, and now you know about Magit.

If you use a Debian based operating system like Ubuntu (and if you don’t, why ever not?), setup is simple:

sudo apt-get install magit

If not, grab the source (git clone git://gitorious.org/magit/mainline.git) and put it some place where Emacs can find  it.

Fire up Emacs and summon Magit with:

M-x magit-status

Details in the documentation, but here’s a list of some useful shortcuts to get you started:

  • g:  updates the status of the buffer (it doesn’t update itself automatically ala svn-status)
  • s:  stages a change
  • c:  starts a commit.  Type a commit message, and hit C-c C-c to commit.
  • P:  pushes
  • F:  pulls  (note:  you need to have your .git/config file properly setup for this to work)
  • b:  switch to a branch (tab completion is supported)
  • B:  create a branch and switch to it
  • M:  automatically merge
  • l: show the log

Aside from reducing the number of times I need to drop to a terminal, using magit discourages gratuitous uses of “git add .”, which always makes me slightly uncomfortable (I like to know what I’m committing), and encourages you to break up commits into nice, log friendly chunks.

Jump and Flap

Monday, March 29th, 2010

Red says:

This year, a movie was released for my birthday, How to Train Your Dragon*.

One of my friends, from the ever more distant days of High School, and I used to use the term, “flying dragons,” to describe the right kind of job, the right kind of activity, the right kind of relationship.  If it is as fulfilling as flying dragons, as freeing, then you’re in a good place. (more…)