From a27221189529378b4b4274a813aa24d9d4d106f2 Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Wed, 23 Mar 2011 08:57:30 -0700 Subject: [PATCH 1/4] Added git-feature --- bin/git-feature | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 bin/git-feature diff --git a/bin/git-feature b/bin/git-feature new file mode 100755 index 0000000..67765ee --- /dev/null +++ b/bin/git-feature @@ -0,0 +1,13 @@ +#!/bin/sh + +if test "$1" = "finish"; then + test -z $2 && echo "feature required." && exit 1 + branch=feature/$2 + git merge --no-ff $branch +else + test -z $1 && echo "feature required." && exit 1 + branch=feature/$1 + git checkout -b $branch &> /dev/null + git checkout $branch &> /dev/null + echo "on branch $branch" +fi \ No newline at end of file From 5578905323d6743b02ff901a746e0e494e0e42fc Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Wed, 23 Mar 2011 16:00:05 -0700 Subject: [PATCH 2/4] Added git-bug --- bin/git-bug | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 bin/git-bug diff --git a/bin/git-bug b/bin/git-bug new file mode 100755 index 0000000..9d94f32 --- /dev/null +++ b/bin/git-bug @@ -0,0 +1,13 @@ +#!/bin/sh + +if test "$1" = "finish"; then + test -z $2 && echo "bug required." && exit 1 + branch=bug/$2 + git merge --no-ff $branch +else + test -z $1 && echo "bug required." && exit 1 + branch=bug/$1 + git checkout -b $branch &> /dev/null + git checkout $branch &> /dev/null + echo "on branch $branch" +fi \ No newline at end of file From 9a6324eab836a0105c9b633becdb9b47e6217dc5 Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Wed, 23 Mar 2011 17:29:26 -0700 Subject: [PATCH 3/4] delete branch after merge --- bin/git-bug | 3 +-- bin/git-feature | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/git-bug b/bin/git-bug index 9d94f32..c86adc0 100755 --- a/bin/git-bug +++ b/bin/git-bug @@ -3,11 +3,10 @@ if test "$1" = "finish"; then test -z $2 && echo "bug required." && exit 1 branch=bug/$2 - git merge --no-ff $branch + git merge --no-ff $branch && git delete-branch $branch else test -z $1 && echo "bug required." && exit 1 branch=bug/$1 git checkout -b $branch &> /dev/null git checkout $branch &> /dev/null - echo "on branch $branch" fi \ No newline at end of file diff --git a/bin/git-feature b/bin/git-feature index 67765ee..42e6b3a 100755 --- a/bin/git-feature +++ b/bin/git-feature @@ -3,11 +3,10 @@ if test "$1" = "finish"; then test -z $2 && echo "feature required." && exit 1 branch=feature/$2 - git merge --no-ff $branch + git merge --no-ff $branch && git delete-branch $branch else test -z $1 && echo "feature required." && exit 1 branch=feature/$1 git checkout -b $branch &> /dev/null git checkout $branch &> /dev/null - echo "on branch $branch" fi \ No newline at end of file From 7d68c2bc7d02046363aaf0eadbcead4c16010572 Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Sun, 3 Apr 2011 09:30:16 -0700 Subject: [PATCH 4/4] Added git-refactor --- bin/git-refactor | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 bin/git-refactor diff --git a/bin/git-refactor b/bin/git-refactor new file mode 100755 index 0000000..68182f2 --- /dev/null +++ b/bin/git-refactor @@ -0,0 +1,12 @@ +#!/bin/sh + +if test "$1" = "finish"; then + test -z $2 && echo "refactor required." && exit 1 + branch=refactor/$2 + git merge --no-ff $branch && git delete-branch $branch +else + test -z $1 && echo "refactor required." && exit 1 + branch=refactor/$1 + git checkout -b $branch &> /dev/null + git checkout $branch &> /dev/null +fi \ No newline at end of file