@@ -9,6 +9,6 @@ st = status amend = commit --amend aa = commit -a --amend - dc = !gitup && git push + dc = !source ~/.profile && gitup && git push conflicts = !git ls-files --unmerged | cut -c51- | sort -u | xargs $EDITOR resolve = !git ls-files --unmerged | cut -c51- | sort -u | xargs git add \ No newline at end of file .gitconfig e32ce59e761cab062e141a498ecfcf025d7f3265 Tim Connor timocratic@gmail.com http://github.com/timocratic/dotfiles/commit/326c8ef163b9ecf433e5c73286fa0221cbfb531c 326c8ef163b9ecf433e5c73286fa0221cbfb531c 2009-11-04T17:27:14-08:00 2009-11-04T17:27:14-08:00 stupid shell was not gettting profile f9f27f47355c4c19adeacc9c98f7b5a9c6904615 Tim Connor timocratic@gmail.com