git-sync 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -1,8 +1,14 @@
-# CHANGELOG - 1.2.0 #
+# CHANGELOG - 2.0.2 #
 
 ### Since 2.0.1 ###
 
-Changed git-pull-request to git-pull-req
+* Added "extra safe" code for deleting on Windows ([GH-121](https://github.com/jdigger/git-process/issues/121))
+* Unknown variable for handling uncommited changes for sync ([GH-123](https://github.com/jdigger/git-process/issues/123))
+* git-sync -r now keeps rebase on instead of acting as a switch ([GH-122](https://github.com/jdigger/git-process/issues/122))
+
+### Since 2.0.0 ###
+
+* Changed git-pull-request to git-pull-req
 
 ### Since 1.1.4 ###
 

data/bin/git-sync

@@ -14,10 +14,10 @@ class SyncOptions
 
 
   def extend_opts(parser)
-    parser.opt :rebase, "Rebase instead of merge against the integration branch", :default => true
-    parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :none, :default => false
+    parser.opt :rebase, "Rebase instead of merge against the integration branch (default: on)", :short => :r
+    parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :m
     parser.opt :force, "Force the push; defaults to true if --rebase is used", :short => :f, :default => false
-    parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l, :default => false
+    parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l
 
     parser.conflicts :rebase, :merge
     parser.conflicts :local, :force
@@ -26,8 +26,8 @@ class SyncOptions
 
   #noinspection RubyUnusedLocalVariable
   def post_parse(opts, argv)
+    opts[:rebase] = true unless opts[:merge]
     opts[:force] = true if opts[:rebase]
-    opts[:merge] = !opts[:rebase]
 
     opts[:branch_name] = argv.shift
   end

data/man/git-sync.1

@@ -2,12 +2,12 @@
 .\"     Title: git-sync
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/11/2013
+.\"      Date: 09/17/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "GIT\-SYNC" "1" "09/11/2013" "\ \&" "\ \&"
+.TH "GIT\-SYNC" "1" "09/17/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-sync
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-11 00:00:00 -06:00
+date: 2013-09-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 2
         - 0
-        - 1
-        version: 2.0.1
+        - 2
+        version: 2.0.2
   type: :runtime
   version_requirements: *id001
 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.)