jjkiers/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bash/Git: Refactor Git aliases, remove aliases exists in git-extras.

Browse Source
This commit is contained in:
Artem Sapegin
2012-12-14 20:01:18 +04:00
parent ab3cb53a00
commit 9fbc0e4bb3
7 changed files with 65 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/bash_aliases.bash
View File

@ -15,7 +15,7 @@ alias pjm="cd ~/Dropbox/Projects/!"
alias o="open"
alias oo="open ."
alias e="subl"
alias marked="open -a marked"
alias gh="github"
alias +x="chmod +x"
# Detect which `ls` flavor is in use
@ -82,9 +82,6 @@ password() { openssl rand -base64 ${1:-8} | c; }
# Show $PATH in a readable way
alias path='echo -e ${PATH//:/\\n}'
# Git root
alias gr='git rev-parse 2>/dev/null && cd "./$(git rev-parse --show-cdup)"'
# NPM
alias npm-patch='npm version patch -m "%s"'
alias npm-release='npm version minor -m "%s"'

39
includes/bash_functions.bash
View File

@ -141,45 +141,6 @@ function yay() {
fi
}
# Setup syncronization of current Git repo with GitHub repo of the same name
# USAGE: git-github [repo]
function git-github() {
user="sapegin"
repo=${1-`basename "$(pwd)"`}
git remote add origin "git@github.com:$user/$repo.git"
git push -u origin master
}
# Setup syncronization of current Git repo with Bitbucket repo of the same name
# USAGE: git-bitbucket [repo]
function git-bitbucket() {
user="sapegin"
repo=${1-`basename "$(pwd)"`}
git remote add origin "git@bitbucket.org:$user/$repo.git"
git push -u origin master
}
# Add remote upstream
# USAGE: git-fork <original-author>
function git-fork() {
user=$1
if [[ "$user" == "" ]]; then
echo "Usage: git-fork <original-author>"
else
repo=`basename "$(pwd)"`
git remote add upstream "git@github.com:$user/$repo.git"
fi
}
# Sync branch with upstream
# USAGE: git-upstream [branch]
function git-upstream() {
branch=${1-master}
git fetch upstream
git checkout $branch
git merge upstream/$branch
}
# Find files with Windows line endings (and convert then to Unix in force mode)
# USAGE: crlf [--force]
function crlf() {

56
includes/bash_git.bash Normal file
View File

@ -0,0 +1,56 @@
# Git related Bash aliases
github_user="sapegin"
bitbucket_user="sapegin"
# `cd` to repo root
alias git-root='git rev-parse 2>/dev/null && cd "./$(git rev-parse --show-cdup)"'
alias gr="git-root"
# Setup syncronization of current Git repo with GitHub repo of the same name
# USAGE: git-github [repo]
function git-github() {
local repo=${1-`basename "$(pwd)"`}
git remote add origin "git@github.com:$github_user/$repo.git"
git push -u origin master
}
# Setup syncronization of current Git repo with Bitbucket repo of the same name
# USAGE: git-bitbucket [repo]
function git-bitbucket() {
local repo=${1-`basename "$(pwd)"`}
git remote add origin "git@bitbucket.org:$bitbucket_user/$repo.git"
git push -u origin master
}
# Add remote upstream
# USAGE: git-fork <original-author>
function git-fork() {
local user=$1
if [[ "$user" == "" ]]; then
echo "Usage: git-fork <original-author>"
else
local repo=`basename "$(pwd)"`
git remote add upstream "git@github.com:$user/$repo.git"
fi
}
# Sync branch with upstream
# USAGE: git-upstream [branch]
function git-upstream() {
local branch=${1-master}
git fetch upstream
git checkout $branch
git merge upstream/$branch
}
# Add all staged files to previous commit
function git-append() {
git log -n 1 --pretty=tformat:%s%n%n%b | git commit -F - --amend
}
# List of files with unresolved conflicts
function git-conflicts() {
git ls-files -u | awk '{print $4}' | sort -u
}