git_commands 3.0.3 → 3.0.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 +14 -7
- 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: 8c5ee655beae7fa80652b9f87b2eadb5f9071490
|
4
|
+
data.tar.gz: aa39a9867606d3bc95ae6a85c2ade4dd0e33c5b9
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 078b02de2b4afed47f954be07badb0ddf1a337ad063ad3e6c58f8545208b61683225341ee7a9bbaddedd2e76f7e13992dbe0cea23de20bd51fe7018eeef17e63
|
7
|
+
data.tar.gz: c9ad03c652bad9e7bfeea2c0abfc9b5ba5a74cbdde424a6fb686a5709a5df1ddec1f7624fc0db96f62f81f5107dc80db3879ab898074b8046851a5b25fca4457
|
data/README.md
CHANGED
@@ -16,7 +16,7 @@ This script will facilitate adopting a subset of the branch-featuring workflow c
|
|
16
16
|
* **release** branches are created **aggregating multiple branches** into a new one
|
17
17
|
|
18
18
|
## Scope
|
19
|
-
The scope of this is helping out in the following cases:
|
19
|
+
The scope of this gem is helping out in the following cases:
|
20
20
|
* you have multiple feature branches waiting for release due to some reason (i.e. long QA time...), and need to keep them aligned with master
|
21
21
|
* you need to quickly aggregate branches for a release
|
22
22
|
|
@@ -24,14 +24,14 @@ The scope of this is helping out in the following cases:
|
|
24
24
|
I assume you have GIT installed ;)
|
25
25
|
Just install the gem to use the binaries commands.
|
26
26
|
```
|
27
|
-
gem
|
27
|
+
gem install git_commands
|
28
28
|
```
|
29
29
|
|
30
30
|
## Usage
|
31
31
|
Here are the main commands:
|
32
32
|
|
33
33
|
### Help
|
34
|
-
Each command
|
34
|
+
Each command come with a help option that can be displayed:
|
35
35
|
|
36
36
|
```
|
37
37
|
rebase --help
|
@@ -43,13 +43,20 @@ Usage: rebase --repo=./Sites/oro --branches=feature/add_bin,fetaure/remove_rake_
|
|
43
43
|
|
44
44
|
### rebase
|
45
45
|
This is probably the most useful command in case you have several branches to rebase with _origin/master_ frequently.
|
46
|
-
A confirmation is asked to
|
46
|
+
A confirmation is asked to before rebasing.
|
47
47
|
|
48
48
|
```
|
49
49
|
rebase --repo=~/Sites/greatest_hits --branches=feature/love_me_tender,feature/teddybear,feature/return_to_sender
|
50
50
|
```
|
51
51
|
|
52
|
-
You can also specify as the *branches*
|
52
|
+
You can also specify as the *branches* argument a path to a file containing the branches names on each line, like this:
|
53
|
+
|
54
|
+
```txt
|
55
|
+
feature/love_me_tender
|
56
|
+
feature/teddybear
|
57
|
+
feature/return_to_sender
|
58
|
+
feature/in_the_ghetto
|
59
|
+
```
|
53
60
|
|
54
61
|
```
|
55
62
|
rebase --repo=~/Sites/greatest_hits --branches=~/greatest_hits/.branches
|
@@ -57,7 +64,7 @@ rebase --repo=~/Sites/greatest_hits --branches=~/greatest_hits/.branches
|
|
57
64
|
|
58
65
|
### purge
|
59
66
|
This command remove the specified branches locally and remotely.
|
60
|
-
A confirmation is asked before
|
67
|
+
A confirmation is asked before removal.
|
61
68
|
|
62
69
|
```
|
63
70
|
purge --repo=~/temp/top_20 --branches=release/in_the_ghetto
|
@@ -66,7 +73,7 @@ purge --repo=~/temp/top_20 --branches=release/in_the_ghetto
|
|
66
73
|
### aggregate
|
67
74
|
It should be useful to aggregate your branches into a single one in case you want to create a release branch.
|
68
75
|
It uses the following naming convention: *release/yyyy_mm_dd*
|
69
|
-
A confirmation is asked
|
76
|
+
A confirmation is asked before aggregating.
|
70
77
|
|
71
78
|
```
|
72
79
|
aggregate --repo=~/Sites/greatest_hits --branches=~/greatest_hits/.branches
|
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.0.
|
4
|
+
version: 3.0.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-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|