John Schulz 760cc8be63 Add gmu (git merge upstream) alias ...

* Pull in `origin` & `upstream` and merge them into `upstream/master`
from http://www.gitready.com/intermediate/2009/02/12/easily-fetching-upstream-changes.html

2010-11-11 12:45:32 -05:00

..

emacs.aliases.bash

Updated emacs alias.

2010-10-25 09:51:22 -07:00

general.aliases.bash

Changed names of pager and editor aliases to page and edit, respectively.

2010-11-01 17:03:10 -05:00

git.aliases.bash

Add gmu (git merge upstream) alias

2010-11-11 12:45:32 -05:00

heroku.aliases.bash

Made a lot of changes: no more functions directory. All aliases have been moved to the new alias directory. Plugins are now for functions only. Updated the README to reflect the changes and add a contributor's list.

2010-10-10 09:24:19 -07:00

hg.aliases.bash

Started adding mercurial aliases.

2010-10-15 08:11:54 -07:00

jekyll.aliases.bash

fixing an argument error

2010-11-02 13:45:21 -07:00

osx.aliases.bash

Fixed chrome alias for Mac OS X

2010-10-17 10:01:15 -05:00

rails.aliases.bash

Made a lot of changes: no more functions directory. All aliases have been moved to the new alias directory. Plugins are now for functions only. Updated the README to reflect the changes and add a contributor's list.

2010-10-10 09:24:19 -07:00

textmate.aliases.bash

Made a lot of changes: no more functions directory. All aliases have been moved to the new alias directory. Plugins are now for functions only. Updated the README to reflect the changes and add a contributor's list.

2010-10-10 09:24:19 -07:00

todo.txt-cli.aliases.bash

Added help for todo.txt-cli aliases.

2010-10-31 15:28:06 -05:00

vim.aliases.bash

Made a lot of changes: no more functions directory. All aliases have been moved to the new alias directory. Plugins are now for functions only. Updated the README to reflect the changes and add a contributor's list.

2010-10-10 09:24:19 -07:00