If possible, interactively rebase your feature branch against master before merging, and condense your work-in-progress commits to clean, single-purpose commits.
Prereq: install git-up
git up
git checkout 
neilrenicker
/ merging-pull-requests.md
Last active
May 6, 2016 05:00
| # | Podcast Title | Update Frequency | Genre(s) | About | AJC Note |
|---|---|---|---|---|---|
| 1 | Above & Beyond Group Therapy | Weekly | Trance, Progressive | Two hour mix, guest mix for last 30 minutes. Great for uplifting, energetic and feel-good trance. | There's not much better than putting this podcast on and driving with the windows down on a beautiful day. |
| 2 | Adam Beyer presents Drumcode | Weekly | Techno | Pounding, driving techno mixes that are usually a 1 hour cut from a live set he did that week/month. | Adam Beyer is the techno king. If you haven't been exposed to much techno, this is a great crash course. |
| 3 | Avicii - Levels Podcast | Monthly | House, Progressive | Monthly podcast from Avicii frequently disp |
mutewinter
/ gifify.sh
Last active
December 25, 2015 12:29
— forked from SlexAxton/.zshrc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Sweet Gif Creation from .mov | |
| # | |
| # Adapted from https://gist.github.com/SlexAxton/4989674 | |
| gifify() { | |
| if [[ -n "$1" ]]; then | |
| GIF="${1%.*}.gif" | |
| if [[ $2 == '--bad' ]]; then | |
| ffmpeg -i $1 -s 600x400 -pix_fmt rgb24 -r 10 -f gif - | gifsicle --optimize=3 --delay=3 > $GIF | |
| else | |
| ffmpeg -i $1 -r 10 -vcodec png out-static-%05d.png |
asimpson
/ bash_function
Created
October 31, 2012 18:51
This little script sets up a custom domain in MAMP and your hosts file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| function vhost { | |
| sudo ~/.dotfiles/osx/mamp_vh.sh $1 | |
| } |
artero
/ launch_sublime_from_terminal.markdown
Last active
May 15, 2024 03:38
— forked from olivierlacan/launch_sublime_from_terminal.markdown
Launch Sublime Text 2 from the Mac OS X Terminal
Sublime Text 2 ships with a CLI called subl (why not "sublime", go figure). This utility is hidden in the following folder (assuming you installed Sublime in /Applications like normal folk. If this following line opens Sublime Text for you, then bingo, you're ready.
open /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl
You can find more (official) details about subl here: http://www.sublimetext.com/docs/2/osx_command_line.html