Nathan Broadbent d128fb58d7 Fixed merge conflict resolution functions to handle multiple expanded arguments

2012-08-13 00:58:51 +12:00

..

fallback

removed tabs

2012-07-14 10:47:45 +12:00

aliases_and_bindings.sh

Added switch for zsh / bash

2012-08-12 21:16:05 +12:00

repo_index.sh

Use escaped git function, so it doesn't go through any aliases like hub

2012-08-12 21:32:05 +12:00

status_shortcuts.rb

Parse long git status for submodule summaries, if .gitmodules exists and any changed 'files' are submodules.

2011-12-23 12:46:29 +08:00

status_shortcuts.sh

Fixed merge conflict resolution functions to handle multiple expanded arguments

2012-08-13 00:58:51 +12:00

tools.sh

Removed update_travis_ci_status function (moved to ndbroadbent/dotfiles repo)

2012-03-18 22:33:46 +08:00