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.
| postgres=# \dx | |
| List of installed extensions | |
| Name | Version | Schema | Description | |
| ---------+---------+------------+------------------------------ | |
| plpgsql | 1.0 | pg_catalog | PL/pgSQL procedural language | |
| (1 row) | |
| postgres=# \dx+ | |
| Objects in extension "plpgsql" | |
| Object Description |
| < | |
| %3C | |
| < | |
| < | |
| < | |
| < | |
| < | |
| < | |
| < | |
| < |
As configured in my dotfiles.
start new:
tmux
start new with session name:
| This playbook has been removed as it is now very outdated. |
| 0e3647e8592d35514a081243582536ed3de6734059001e3f535ce6271032 | |
| 334b041de124f73c18011a50e608097ac308ecee501337ec3e100854201d | |
| 40e127f51c10031d0133590b1e490f3514e05a54143d08222c2a4071e351 | |
| 45440b171d5c1b21342e021c3a0eee7373215c4024f0eb733cf006e2040c | |
| 22015e420b07ef21164d5935e82338452f42282c1836e42536284c450de3 | |
| 043b452e0268e7eb005a080b360f0642e6e342005217ef04a42f3e43113d | |
| 581e0829214202063d70030845e5301f5a5212ed0818e22f120b211b171b | |
| ea0b342957394717132307133f143a1357e9ed1f5023034147465c052616 | |
| 0c300b355c2051373a051851ee154a023723414c023a08171e1b4f17595e | |
| 550c3e13e80246320b0bec09362542243be42d1d5d060e203e1a0c66ef48 |
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:
This is a little trick I use to spin up the packages instalation on Debian/Ubuntu boxes in Vagrant.
I add a simple function that checks if a directory named something similar to ~/.vagrant.d/cache/apt/opscode-ubuntu-12.04/partial (it may have another path in Windows or MacOS) and create the directory if it doesn't already exist.
def local_cache(basebox_name)
cache_dir = Vagrant::Environment.new.home_path.join('cache', 'apt', basebox_name)
partial_dir = cache_dir.join('partial')
partial_dir.mkdir unless partial_dir.exist?
cache_dirThis tutorial guides you through creating your first Vagrant project.
We start with a generic Ubuntu VM, and use the Chef provisioning tool to:
Afterwards, we'll see how easy it is to package our newly provisioned VM
Attention: the list was moved to
https://github.com/dypsilon/frontend-dev-bookmarks
This page is not maintained anymore, please update your bookmarks.
