lytedev/dotfiles
Archived
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:lytedev/dotfiles

Browse source
This commit is contained in:
Daniel Flanagan 2017-07-18 12:47:43 -05:00
parent 208682e05b 80fe5040f8
commit 7b3cf9d38a
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
shell/aliases
View file

@ -55,6 +55,19 @@ alias gpl="git pull"
alias gp="git push" alias gp="git push"
alias gac="git add -A && git commit" alias gac="git add -A && git commit"
grb() {
MAIN_BRANCH="master"
CUR_BRANCH="$(git branch | grep \* | cut -d ' ' -f2-)"
if [[ ! -z ${2+x} ]]; then
MAIN_BRANCH="$2"
CUR_BRANCH="$1"
elif [[ ! -z ${1+x} ]]; then
MAIN_BRANCH="$1"
fi
git rebase -i $(git merge-base "$CUR_BRANCH" "$MAIN_BRANCH")
}
# browser aliases # browser aliases
alias qute="qutebrowser --backend webengine" alias qute="qutebrowser --backend webengine"