git_commands 3.3.6 → 3.3.7
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.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/git_commands/computer.rb +7 -7
- data/lib/git_commands/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4b9df5d09769634c3dc383e862a2a0f6effe9141
|
4
|
+
data.tar.gz: 2e903481e8ad0a0a7efa12ccc018f55158d418eb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7430f5fcd09df1229cbc6dab10631e54a37cd6209df1a529910a18f89932ad62647ce07639932cc31633e576f10258f6372e192972381de8b6449ba69ee09aa9
|
7
|
+
data.tar.gz: 02a8e71e2f28e97f92eec396a25394e49afa2a156983f7ce5c595de98e2c7868f43ce9bb45eaa8945077e959d592f27dbcb2abeae9862811bcdb6acb0081bc46
|
data/README.md
CHANGED
@@ -166,7 +166,7 @@ remove --repo=/temp/top_20 --branches=*obsolete*
|
|
166
166
|
|
167
167
|
#### Aggregate
|
168
168
|
This command aggregates all of the specified branches into a single one in case you want to create a release branch.
|
169
|
-
The created
|
169
|
+
The created aggregate branch follows this naming convention: *aggregate/yyyy_mm_dd*
|
170
170
|
A confirmation is asked before aggregating.
|
171
171
|
|
172
172
|
```
|
@@ -50,21 +50,21 @@ module GitCommands
|
|
50
50
|
|
51
51
|
def aggregate
|
52
52
|
temp = "temp/#{@timestamp}"
|
53
|
-
|
54
|
-
confirm("Aggregate branches into #{
|
53
|
+
target = "aggregate/#{@timestamp}"
|
54
|
+
confirm("Aggregate branches into #{target}") do
|
55
55
|
enter_repo do
|
56
|
-
`git branch #{
|
56
|
+
`git branch #{target}`
|
57
57
|
@branches.each do |branch|
|
58
58
|
warning("Merging branch: #{branch}")
|
59
59
|
`git checkout -b #{temp} origin/#{branch} --no-track`
|
60
|
-
clean_and_exit([temp,
|
61
|
-
clean_and_exit([temp]) unless rebase_with(
|
62
|
-
`git checkout #{
|
60
|
+
clean_and_exit([temp, target]) unless rebase_with
|
61
|
+
clean_and_exit([temp]) unless rebase_with(target)
|
62
|
+
`git checkout #{target}`
|
63
63
|
`git merge #{temp}`
|
64
64
|
`git branch -D #{temp}`
|
65
65
|
end
|
66
66
|
end
|
67
|
-
success("#{
|
67
|
+
success("#{target} branch created")
|
68
68
|
end
|
69
69
|
end
|
70
70
|
|
data/lib/git_commands/version.rb
CHANGED