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:
| #!/usr/bin/perl | |
| # | |
| # Brad's el-ghetto do-our-storage-stacks-lie?-script | |
| # | |
| sub usage { | |
| die <<'END'; | |
| Usage: diskchecker.pl -s <server[:port]> verify <file> | |
| diskchecker.pl -s <server[:port]> create <file> <size_in_MB> | |
| diskchecker.pl -l [port] |
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.