git_dj 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/README.md +0 -1
  2. data/lib/git_dj/version.rb +1 -1
  3. data/lib/git_dj.rb +2 -0
  4. metadata +2 -2
data/README.md CHANGED
@@ -1,4 +1,3 @@
1
- # Git::Dj
2
1
  # Git Dj - is an simple lightweight alternative for git flow. See, how it works:
3
2
 
4
3
  **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 CHANGED
@@ -1,3 +1,3 @@
1
1
  class GitDj
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
data/lib/git_dj.rb CHANGED
@@ -39,6 +39,7 @@ class GitDj
39
39
  run_cmds [
40
40
  "git checkout #{INTEGRATION_BRANCH}",
41
41
  "git merge #{cur_branch}",
42
+ "git pull origin #{INTEGRATION_BRANCH}",
42
43
  "git push origin #{INTEGRATION_BRANCH}",
43
44
  "git checkout #{cur_branch}"
44
45
  ]
@@ -58,6 +59,7 @@ class GitDj
58
59
  run_cmds [
59
60
  "git checkout #{RELEASE_BRANCH}",
60
61
  "git merge #{cur_branch}",
62
+ "git pull origin #{RELEASE_BRANCH}",
61
63
  "git push origin #{RELEASE_BRANCH}",
62
64
  "git checkout #{cur_branch}"
63
65
  ]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: git_dj
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-24 00:00:00.000000000 Z
12
+ date: 2012-12-25 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: A simple and lightweight alternative to git flow
15
15
  email: