Francisco Figueiredo Jr. franciscojunior

The introduction to Reactive Programming you've been missing

This tutorial as a series of videos

If you prefer to watch video tutorials with live-coding, then check out this series I recorded with the same contents as in this article: Egghead.io - Introduction to Reactive Programming.

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.

	pkg=$(adb shell pm path com.koushikdutta.backup)
	# apparently pm path appends a carriage return which screws
	# up the class name in dalvikvm invocation
	pkg=$(echo $pkg \| cut -d : -f 2 \| sed s/\\r//g)
	echo $pkg
	adb shell << EOF
	CLASSPATH=$pkg app_process /system/bin com.koushikdutta.shellproxy.ShellRunner2 $@ &
	exit
	EOF

	# http://henrik.nyh.se/2008/12/git-dirty-prompt
	# http://www.simplisticcomplexity.com/2008/03/13/show-your-git-branch-name-in-your-prompt/
	# username@Machine ~/dev/dir[master]$ # clean working directory
	# username@Machine ~/dev/dir[master*]$ # dirty working directory

	function parse_git_dirty {
	[[ $(git status 2> /dev/null \| tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
	}
	function parse_git_branch {
	git branch --no-color 2> /dev/null \| sed -e '/^[^]/d' -e "s/ \(.*\)/[\1$(parse_git_dirty)]/"