Merge pull request #41 from honzakuzel1989/git-done-merge-release

Author: jwiegley

git-branch-done

@@ -0,0 +1,16 @@
+#!/bin/bash
+# git branch-done <branch>
+
+# destination branch as parameter - depends on merge strategy, typically master
+DST_BRANCH=""
+if [ ! -z "$1" ]; then
+    DST_BRANCH="$1"
+else
+	echo "Usage: git branch-done <branch>"
+	exit 1
+fi
+
+# get  current branch - typically topic branch like taskXXXX, bugXXXX, ...
+cb=`git rev-parse --abbrev-ref HEAD`
+# no fast forward merge from current branch to destination branch
+git checkout $DST_BRANCH && git merge --no-ff $cb && git branch -d $cb

git-merge-to

@@ -0,0 +1,16 @@
+#!/bin/bash
+# git merge-to <branch>
+
+# destination branch as parameter - depends on merge strategy, typically release
+DST_BRANCH=""
+if [ ! -z "$1" ]; then
+    DST_BRANCH="$1"
+else
+	echo "Usage: git merge-to <branch>"
+	exit 1
+fi
+
+# get  current branch - typically master or develop
+cb=`git rev-parse --abbrev-ref HEAD`
+# no fast forward merge from current branch to destination branch
+git checkout $DST_BRANCH && git merge --ff $cb && git co $cb

git-release

@@ -0,0 +1,16 @@
+#!/bin/bash
+# git release <branch>
+
+# destination branch as parameter - depends on merge strategy, typically release
+DST_BRANCH=""
+if [ ! -z "$1" ]; then
+    DST_BRANCH="$1"
+else
+	echo "Usage: git release <branch>"
+	exit 1
+fi
+
+# get  current branch - typically master or develop
+cb=`git rev-parse --abbrev-ref HEAD`
+# push current branch, pull destination branch, fast forward merge from current branch to destination branch, push and return
+git push && git checkout $DST_BRANCH && git pull && git merge --ff $cb && git push && git checkout $cb