(C-x means ctrl+x, M-x means alt+x)
The default prefix is C-b. If you (or your muscle memory) prefer C-a, you need to add this to ~/.tmux.conf
:
# the following two lines give a two-line status, with the current window highlighted | |
hardstatus alwayslastline | |
hardstatus string '%{= kG}[%{G}%H%? %1`%?%{g}][%= %{= kw}%-w%{+b yk} %n*%t%?(%u)%? %{-}%+w %=%{g}][%{B}%m/%d %{W}%C%A%{g}]' | |
# huge scrollback buffer | |
defscrollback 5000 | |
# no welcome message | |
startup_message off |
# Credit http://stackoverflow.com/a/2514279 | |
for branch in `git branch -r | grep -v HEAD`;do echo -e `git show --format="%ai %ar by %an" $branch | head -n 1` \\t$branch; done | sort -r |
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:
<?php | |
/** | |
* Convert under_score type array's keys to camelCase type array's keys | |
* @param array $array array to convert | |
* @param array $arrayHolder parent array holder for recursive array | |
* @return array camelCase array | |
*/ | |
public function camelCaseKeys($array, $arrayHolder = array()) { | |
$camelCaseArray = !empty($arrayHolder) ? $arrayHolder : array(); |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
SomeRoute: | |
pattern: /someroute | |
defaults: | |
_controller: SomeBundle:Controller:action | |
AnotherRoute: | |
pattern: /anotherroute | |
defaults: | |
_controller: FrameworkBundle:Redirect:redirect | |
route: SomeRoute |
#!/bin/sh | |
# | |
# Install Varnish via Homebrew | |
# | |
# You need to add /usr/local/sbin in your PATH | |
# vcl files are in /usr/local/etc/varnish | |
# | |
# Usage : |