git_commands 3.3.3 → 3.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +7 -6
- data/lib/git_commands/branch.rb +0 -1
- data/lib/git_commands/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d9f2375bee078d38f83b5ff3fceba64b02086f77
|
4
|
+
data.tar.gz: 2fac8aa581ce6a8f5ef5059f4c5218b3fb50939c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: adc8f5c208fd40a03e0b9dc9ab1503515959a6911dc59b8cc4fc94b8a6a4553de3c035b20f3acdc0354857e952d3e2b1a77eb0a43756a9b6f5fb2f6c2325117f
|
7
|
+
data.tar.gz: 6fcc3bef88bce4cc69d02fa869f2f1d89baa82145be76f887400eb93cd91d577cb3e9c7fbd92128f570ba4038330b02354c9012624fe68e9e1b4527184049dc9
|
data/README.md
CHANGED
@@ -14,10 +14,10 @@
|
|
14
14
|
* [Aggregate](#aggregate)
|
15
15
|
|
16
16
|
## Workflow
|
17
|
-
This script
|
17
|
+
This script facilitates adopting a subset of the branch-featuring workflow characterised by:
|
18
18
|
* each feature will have its own branch
|
19
19
|
* feature branches derive directly form master
|
20
|
-
* integration of master to feature branch happens via rebasing
|
20
|
+
* integration of master to feature branch happens via rebasing to maintain a straight commits line
|
21
21
|
* force pushing of feature branches to origin is not an issue
|
22
22
|
* release branches are created aggregating multiple branches
|
23
23
|
|
@@ -114,7 +114,8 @@ Successfully loaded 2 branches:
|
|
114
114
|
```
|
115
115
|
|
116
116
|
##### Checking
|
117
|
-
Each loaded branch is validated for existence (but for branches loaded via pattern matching
|
117
|
+
Each loaded branch is validated for existence (but for branches loaded via pattern matching, already fetched from origin).
|
118
|
+
In case the validation fails, the branch is filtered from the resulting list.
|
118
119
|
|
119
120
|
```
|
120
121
|
rebase --repo=/Users/Elvis/greatest_hits --branches=noent,feature/love_me_tender
|
@@ -132,7 +133,7 @@ No branches loaded!
|
|
132
133
|
```
|
133
134
|
|
134
135
|
##### Master branch
|
135
|
-
Master branch cannot be included into the branches list for obvious reasons
|
136
|
+
Master branch cannot be included into the branches list for obvious reasons:
|
136
137
|
|
137
138
|
```
|
138
139
|
rebase --repo=/Users/Elvis/greatest_hits --branches=master,feature/love_me_tender
|
@@ -146,7 +147,7 @@ Successfully loaded 1 branch:
|
|
146
147
|
Here are the available GIT commands:
|
147
148
|
|
148
149
|
#### Rebase
|
149
|
-
This is
|
150
|
+
This command is useful in case you have several branches to rebase with _origin/master_ frequently.
|
150
151
|
A confirmation is asked to before rebasing.
|
151
152
|
|
152
153
|
```
|
@@ -165,7 +166,7 @@ purge --repo=/temp/top_20 --branches=*obsolete*
|
|
165
166
|
|
166
167
|
#### Aggregate
|
167
168
|
This command aggregates all of the specified branches into a single one in case you want to create a release branch.
|
168
|
-
|
169
|
+
The created release branch follows this naming convention: *release/yyyy_mm_dd*
|
169
170
|
A confirmation is asked before aggregating.
|
170
171
|
|
171
172
|
```
|
data/lib/git_commands/branch.rb
CHANGED
data/lib/git_commands/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git_commands
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.
|
4
|
+
version: 3.3.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- costajob
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-10-
|
11
|
+
date: 2016-10-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|