todgru

#Oops, I merged untested changes to master!

You've made changes to master, commited and push up to your repo. Git is flexible enough that you can dig yourself out rather easily. Here are two of many options to get back to a safe place.

Option 1, Branch out and keep your changes.
Option 2, Reset the branch and lose changes.

The final step in both of these options is $ git push --force origin master.

##Option 1: Branch Out

#git tag

Think of a git tag as an alias to a sha1 or to a branch.

The Git Book on tagging says there are two main typs of tags, lightweight and annotated. Lightweight only records commit and tag. Annotated records who, what, when and where. Use annotated, -a.

List all tags:

$ git tag

Oh yes, this is nice:

git revert --strategy resolve <sha-ish>

Given a git log of A--B--C--D--E you can remove commit C using:

git revert --strategy resolve <sha-of-C>

Which will produce:

`scp`

From: http://codysoyland.com/2010/jun/6/ssh-tip-automatic-reverse-tunnels-workflow-simplif/

Find the remote file:

local:~$ ssh remote
remote:~$ find . -name 'file.tar.gz'
/home/cody/somewhere/deep/file.tar.gz

#vim

Editing

shift V select line, up or down select lines
shift > shift select block or line out
shift < shift select block or line in
d to delete highlighted text and copy to cliboard
D delete everything after cursor to end of line
y to copy (yank)

#launchd Usage

I have a bash script called foo.sh that takes one command line argument, bar. I want it to run every 60 seconds and load at startup.

an XML plist is Apple Property List
com.mydomain.foo.plist Name of launchd plist file should be a reverse fqdn, like (this may not be required, but convention)
com.mydomain.foo.plist lives in $HOME/Library/LaunchAgents and is ran as that user.
com.mydomain.foo.plist can also live /Library/LaunchDaemons or /Library/LaunchAgents, have requirements, ran as root
Load plist with launchctl load com.mydomain.foo.plist
Unload plist with lauchctl unload com.mydomain.foo.plist

du -sh {directory} list display size of directory in human readable format.
du -sh * show size of each directory in the current path
df disk space usage

$ du -sh *
 11M  Applications
1.9G	Desktop
 14G	Documents
8.0K	Downloads

vim git gpg

brew install gnugp
might need to comment out line 223 of ~/.gnupg/gpg.conf
gpg --gen-key generate key
gpg --list-key show key lists

see: http://enter2exit.wordpress.com/2011/03/01/managing-passwords-with-vimgpggit/ http://www.madboa.com/geek/gpg-quickstart/

Transparent Git Encryption

This document has been modified from its [original format][m1], which was written by Ning Shang ([email protected]). It has been updated and reformatted into a [Markdown][m2] document by [Woody Gilk][m3] and [republished][m4].

Description

When working with a remote git repository which is hosted on a third-party storage server, data confidentiality sometimes becomes

	//## Moment.JS Holiday Plugin
	//
	//Usage:
	// Call .holiday() from any moment object. If date is a US Federal Holiday, name of the holiday will be returned.
	// Otherwise, return nothing.
	//
	// Example:
	// `moment('12/25/2013').holiday()` will return "Christmas Day"
	//
	//Holidays: