git-sync 2.0.1 → 2.0.2
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.
- data/CHANGELOG.md +8 -2
- data/bin/git-sync +4 -4
- data/man/git-sync.1 +2 -2
- metadata +7 -7
data/CHANGELOG.md
CHANGED
|
@@ -1,8 +1,14 @@
|
|
|
1
|
-
# CHANGELOG -
|
|
1
|
+
# CHANGELOG - 2.0.2 #
|
|
2
2
|
|
|
3
3
|
### Since 2.0.1 ###
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
* Added "extra safe" code for deleting on Windows ([GH-121](https://github.com/jdigger/git-process/issues/121))
|
|
6
|
+
* Unknown variable for handling uncommited changes for sync ([GH-123](https://github.com/jdigger/git-process/issues/123))
|
|
7
|
+
* git-sync -r now keeps rebase on instead of acting as a switch ([GH-122](https://github.com/jdigger/git-process/issues/122))
|
|
8
|
+
|
|
9
|
+
### Since 2.0.0 ###
|
|
10
|
+
|
|
11
|
+
* Changed git-pull-request to git-pull-req
|
|
6
12
|
|
|
7
13
|
### Since 1.1.4 ###
|
|
8
14
|
|
data/bin/git-sync
CHANGED
|
@@ -14,10 +14,10 @@ class SyncOptions
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
def extend_opts(parser)
|
|
17
|
-
parser.opt :rebase, "Rebase instead of merge against the integration branch", :
|
|
18
|
-
parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :
|
|
17
|
+
parser.opt :rebase, "Rebase instead of merge against the integration branch (default: on)", :short => :r
|
|
18
|
+
parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :m
|
|
19
19
|
parser.opt :force, "Force the push; defaults to true if --rebase is used", :short => :f, :default => false
|
|
20
|
-
parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l
|
|
20
|
+
parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l
|
|
21
21
|
|
|
22
22
|
parser.conflicts :rebase, :merge
|
|
23
23
|
parser.conflicts :local, :force
|
|
@@ -26,8 +26,8 @@ class SyncOptions
|
|
|
26
26
|
|
|
27
27
|
#noinspection RubyUnusedLocalVariable
|
|
28
28
|
def post_parse(opts, argv)
|
|
29
|
+
opts[:rebase] = true unless opts[:merge]
|
|
29
30
|
opts[:force] = true if opts[:rebase]
|
|
30
|
-
opts[:merge] = !opts[:rebase]
|
|
31
31
|
|
|
32
32
|
opts[:branch_name] = argv.shift
|
|
33
33
|
end
|
data/man/git-sync.1
CHANGED
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
.\" Title: git-sync
|
|
3
3
|
.\" Author: [see the "AUTHOR" section]
|
|
4
4
|
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
|
|
5
|
-
.\" Date: 09/
|
|
5
|
+
.\" Date: 09/17/2013
|
|
6
6
|
.\" Manual: \ \&
|
|
7
7
|
.\" Source: \ \&
|
|
8
8
|
.\" Language: English
|
|
9
9
|
.\"
|
|
10
|
-
.TH "GIT\-SYNC" "1" "09/
|
|
10
|
+
.TH "GIT\-SYNC" "1" "09/17/2013" "\ \&" "\ \&"
|
|
11
11
|
.\" -----------------------------------------------------------------
|
|
12
12
|
.\" * Define some portability stuff
|
|
13
13
|
.\" -----------------------------------------------------------------
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: git-sync
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 11
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 2
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 2.0.
|
|
9
|
+
- 2
|
|
10
|
+
version: 2.0.2
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Jim Moore
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2013-09-
|
|
18
|
+
date: 2013-09-17 00:00:00 -06:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|
|
@@ -26,12 +26,12 @@ dependencies:
|
|
|
26
26
|
requirements:
|
|
27
27
|
- - "="
|
|
28
28
|
- !ruby/object:Gem::Version
|
|
29
|
-
hash:
|
|
29
|
+
hash: 11
|
|
30
30
|
segments:
|
|
31
31
|
- 2
|
|
32
32
|
- 0
|
|
33
|
-
-
|
|
34
|
-
version: 2.0.
|
|
33
|
+
- 2
|
|
34
|
+
version: 2.0.2
|
|
35
35
|
type: :runtime
|
|
36
36
|
version_requirements: *id001
|
|
37
37
|
description: Fetches the latest repository from the server, rebases/merges the current branch against the changes in the integration branch, then pushes the result up to a branch on the server of the same name. (Unless told not to.)
|