git_dj 0.0.4 → 0.0.5

data/README.md

@@ -1,4 +1,3 @@
-# Git::Dj
 # Git Dj - is an simple lightweight alternative for git flow. See, how it works:
 
 **gdj integrate** – merges current branch into staging branch, executes git push origin staging and switches back to current branch

data/lib/git_dj/version.rb

@@ -1,3 +1,3 @@
 class GitDj
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/git_dj.rb

@@ -39,6 +39,7 @@ class GitDj
       run_cmds [
         "git checkout #{INTEGRATION_BRANCH}",
         "git merge #{cur_branch}",
+        "git pull origin #{INTEGRATION_BRANCH}",
         "git push origin #{INTEGRATION_BRANCH}",
         "git checkout #{cur_branch}"
       ]
@@ -58,6 +59,7 @@ class GitDj
       run_cmds [
         "git checkout #{RELEASE_BRANCH}",
         "git merge #{cur_branch}",
+        "git pull origin #{RELEASE_BRANCH}",
         "git push origin #{RELEASE_BRANCH}",
         "git checkout #{cur_branch}"
       ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_dj
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies: []
 description: A simple and lightweight alternative to git flow
 email: