gitcycle 0.2.23 → 0.2.24

data/gitcycle.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "gitcycle"
-  s.version     = '0.2.23'
+  s.version     = '0.2.24'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

data/lib/gitcycle.rb

@@ -187,6 +187,7 @@ class Gitcycle
 
   def commit(*args)
     msg = nil
+    no_add = args.delete("--no-add")
 
     if args.empty?
       require_git && require_config
@@ -205,13 +206,19 @@ class Gitcycle
       end
     end
 
-    cmd = "git add . && git add . -u && git commit -a"
+    if no_add
+      cmd = "git commit"
+    else
+      cmd = "git add . && git add . -u && git commit -a"
+    end
 
-    if msg
-      run(cmd + "m #{msg.dump}")
+    if File.exists?("#{Dir.pwd}/.git/MERGE_HEAD")
+      Kernel.exec(cmd)
+    elsif msg
+      run(cmd + " -m #{msg.dump}")
       Kernel.exec("git commit --amend")
     elsif args.empty?
-      run(cmd)
+      Kernel.exec(cmd)
     else
       exec_git(:commit, args)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitcycle
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber