XorA/bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Robert R Evans
2010-12-28 09:15:31 -08:00
parent 4418698a34 c505dcfbbd
commit b1df1ab0fe
17 changed files with 492 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aliases/general.aliases.bash
View File

@@ -23,6 +23,8 @@ alias q="exit"
alias irc="$IRC_CLIENT"
alias rb="ruby"
# Pianobar can be found here: http://github.com/PromyLOPh/pianobar/
alias piano="pianobar"

10
aliases/git.aliases.bash
View File

@@ -16,6 +16,7 @@ alias gpo='git push origin'
alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v'
alias gca='git commit -v -a'
alias gci='git commit --interactive'
alias gb='git branch'
alias gba='git branch -a'
alias gcount='git shortlog -sn'
@@ -23,6 +24,8 @@ alias gcp='git cherry-pick'
alias gco='git checkout'
alias gexport='git archive --format zip --output'
alias gdel='git branch -D'
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
alias gll='git log --graph --pretty=oneline --abbrev-commit'
case $OSTYPE in
linux*)
@@ -55,13 +58,16 @@ function git-help() {
echo " gdv = git diff -w \"$@\" | vim -R -"
echo " gc = git commit -v"
echo " gca = git commit -v -a"
echo " gci = git commit --interactive"
echo " gb = git branch"
echo " gba = git branch -a"
echo " gcount = git shortlog -sn"
echo " gcp = git cherry-pick"
echo " gco = git checkout"
echo " gexport = git git archive --format zip --output"
echo " gdel = git branch -D"
echo " gpo = git push origin"
echo " gdel = git branch -D"
echo " gpo = git push origin"
echo " gmu = git fetch origin -v; git fetch upstream -v; git merge upstream/master"
echo " gll = git log --graph --pretty=oneline --abbrev-commit"
echo
}