githole 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/githole/git.rb +4 -1
- data/lib/githole/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: c476438dd6ac3e4ac8d7e6ae4ca7edcd77a3ff64
|
|
4
|
+
data.tar.gz: bacb13baea149444d65b166be53efe5794ae0a63
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4eb1c8441448d1573958c772333ac8bffbc6236584e85f4c961a87a6a4479b3ac5c129d5f0c69ef9e6eef82db1c452e16d1514b205da840ae4e0dd8398600851
|
|
7
|
+
data.tar.gz: 29422dbdd5da89e706c9a5242496dc122030e18703a3bcd4b51161a6b94195225fe5857cab0419bdada0e3f9c0eeff70ebe507f5b19aafa5ac0ea0ea4d0f8371
|
data/lib/githole/git.rb
CHANGED
|
@@ -21,11 +21,14 @@ module Githole
|
|
|
21
21
|
def update
|
|
22
22
|
verify remote
|
|
23
23
|
verify local
|
|
24
|
+
# rebase master onto local
|
|
24
25
|
checkout master
|
|
25
26
|
pull master
|
|
27
|
+
checkout local
|
|
28
|
+
rebase master
|
|
29
|
+
# rebase remote onto local
|
|
26
30
|
checkout remote
|
|
27
31
|
pull remote
|
|
28
|
-
rebase master
|
|
29
32
|
checkout local
|
|
30
33
|
rebase remote
|
|
31
34
|
end
|
data/lib/githole/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: githole
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean C Davis
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-02-
|
|
11
|
+
date: 2015-02-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|