blob: 3a5d2a9f520bfb8f97e72afe41ea3904ebf84d17 [file] [log] [blame]
Robert R Evansa4d02422010-10-02 15:07:29 -07001#!/bin/bash
2
3# Aliases
Mark Szymanski479bdf22010-10-15 22:20:43 -05004alias gcl='git clone'
Robert R Evans22d91792010-10-10 09:45:32 -07005alias ga='git add'
6alias gall='git add .'
Robert R Evansa4d02422010-10-02 15:07:29 -07007alias g='git'
zerobearing20cd8b402010-10-07 18:13:57 -07008alias get='git'
Robert R Evansa4d02422010-10-02 15:07:29 -07009alias gst='git status'
10alias gs='git status'
Mark Szymanski5ec52df2010-10-24 08:57:01 -050011alias gss='git status -s'
Robert R Evansa4d02422010-10-02 15:07:29 -070012alias gl='git pull'
13alias gup='git fetch && git rebase'
14alias gp='git push'
Robert R Evansb110de42010-10-12 08:37:17 -070015alias gpo='git push origin'
Robert R Evansa4d02422010-10-02 15:07:29 -070016alias gdv='git diff -w "$@" | vim -R -'
17alias gc='git commit -v'
18alias gca='git commit -v -a'
Mark Szymanski6ffba722010-12-20 18:08:01 -060019alias gci='git commit --interactive'
Robert R Evansa4d02422010-10-02 15:07:29 -070020alias gb='git branch'
21alias gba='git branch -a'
22alias gcount='git shortlog -sn'
23alias gcp='git cherry-pick'
zerobearing23802bcc2010-10-06 17:42:29 -070024alias gco='git checkout'
25alias gexport='git archive --format zip --output'
Robert R Evanse2505ee2010-10-13 08:45:12 -070026alias gdel='git branch -D'
John Schulz760cc8b2010-11-11 12:45:32 -050027alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
Florian Baumann36438fe2010-12-28 13:00:44 +010028alias gll='git log --graph --pretty=oneline --abbrev-commit'
Robert R Evansa4d02422010-10-02 15:07:29 -070029
Robert R Evansc9da0862010-10-06 17:27:55 -070030case $OSTYPE in
31 linux*)
32 alias gd='git diff | vim -R -'
33 ;;
34 darwin*)
35 alias gd='git diff | mate'
36 ;;
37 darwin*)
38 alias gd='git diff'
39 ;;
40esac
41
David DeSandro3ef689f2011-06-17 10:57:31 -040042# git add remote branch
43function garb() {
44 echo "Adding remote branch '$1'";
45 git config branch.$1.remote origin;
46 git config branch.$1.merge refs/heads/$1;
47}
Robert R Evansc9da0862010-10-06 17:27:55 -070048
Robert R Evansa4d02422010-10-02 15:07:29 -070049function git-help() {
50 echo "Git Custom Aliases Usage"
Mark Szymanski13abb342010-10-14 14:50:58 -050051 echo
Mark Szymanski479bdf22010-10-15 22:20:43 -050052 echo " gcl = git clone"
Robert R Evansa4d02422010-10-02 15:07:29 -070053 echo " g = git"
Mark Szymanski686ac9c2010-10-14 14:50:06 -050054 echo " get = git"
55 echo " ga = git add"
Mark Szymanski13abb342010-10-14 14:50:58 -050056 echo " gall = git add ."
Robert R Evansa4d02422010-10-02 15:07:29 -070057 echo " gst/gs = git status"
Mark Szymanski5ec52df2010-10-24 08:57:01 -050058 echo " gss = git status -s"
Robert R Evansa4d02422010-10-02 15:07:29 -070059 echo " gl = git pull"
60 echo " gup = git fetch && git rebase"
61 echo " gp = git push"
62 echo " gd = git diff | mate"
63 echo " gdv = git diff -w \"$@\" | vim -R -"
64 echo " gc = git commit -v"
65 echo " gca = git commit -v -a"
Mark Szymanski6ffba722010-12-20 18:08:01 -060066 echo " gci = git commit --interactive"
Robert R Evansa4d02422010-10-02 15:07:29 -070067 echo " gb = git branch"
68 echo " gba = git branch -a"
69 echo " gcount = git shortlog -sn"
70 echo " gcp = git cherry-pick"
zerobearing23802bcc2010-10-06 17:42:29 -070071 echo " gco = git checkout"
72 echo " gexport = git git archive --format zip --output"
John Schulz760cc8b2010-11-11 12:45:32 -050073 echo " gdel = git branch -D"
74 echo " gpo = git push origin"
75 echo " gmu = git fetch origin -v; git fetch upstream -v; git merge upstream/master"
Mark Szymanskic505dcf2010-12-28 10:39:04 -060076 echo " gll = git log --graph --pretty=oneline --abbrev-commit"
Mark Szymanski13abb342010-10-14 14:50:58 -050077 echo
Mark Szymanski686ac9c2010-10-14 14:50:06 -050078}