tcmoore3

# this command makes a POV-Ray 3 script and then renders it with povray, with the following settings:
# use the same aspect ratio as the screen (+W%w and +H%h)
# write targa file (+FT) with filename + ".tga" (-O%s.tga)
# make background transparent (+UA)
# use anti-aliasing (+A)
# make it so that you can kill povray during rendering (+X)
render POV3 vmdscene.pov povray +W%w +H%h -I%s -O%s.tga +X +A +FT +UA

# this is a nice command, but it's tedious to come here and copy it each time
# to get around this, i've written a tcl procedure that does this, and 

nepsilon

How to change your commit messages in Git?

At some point you’ll find yourself in a situation where you need edit a commit message. That commit might already be pushed or not, be the most recent or burried below 10 other commits, but fear not, git has your back 🙂.

Not pushed + most recent commit:

git commit --amend

This will open your $EDITOR and let you change the message. Continue with your usual git push origin master.

mattratleph

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)