git-goodness

gistfile1.eclass

# This is in my .profile, you could also put it in your .bash_profile

feature_deliver() {
  CURRENT=`git branch | grep '\*' | awk '{print $2}'`
  feature_update
  git checkout master
  git merge --squash --no-commit ${CURRENT}
  git commit
}
feature_update() {
  master_update
  git rebase master
}
master_update() {
  CURRENT=`git branch | grep '\*' | awk '{print $2}'`
  git checkout master
  git pull --rebase
  git checkout ${CURRENT}
}
master_deliver() {
  CURRENT=`git branch | grep '\*' | awk '{print $2}'`
  git checkout master
  git push
  git checkout ${CURRENT}
}
feature_create() {
  git switch master
  git checkout -b $1
}
feature_commits() {
  CURRENT=`git branch | grep '\*' | awk '{print $2}'`
  echo "Commits in branch \"${CURRENT}\", but not \"master\":"
  git log master..${CURRENT} --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset" --abbrev-commit --date=relative
}
feature_changes() {
  CURRENT=`git branch | grep '\*' | awk '{print $2}'`
  echo "Commits in branch \"${CURRENT}\", but not \"master\":"
  git diff master..${CURRENT}
}
sync_repo() {
  master_update
  master_deliver
}