summaryrefslogtreecommitdiffstats
path: root/lib/git/base.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/git/base.rb')
-rw-r--r--lib/git/base.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/git/base.rb b/lib/git/base.rb
index 342d535..0b837cb 100644
--- a/lib/git/base.rb
+++ b/lib/git/base.rb
@@ -156,7 +156,7 @@ module Git
def reset_hard(commitish = nil, opts = {})
opts = {:hard => true}.merge(opts)
- self.lib.reset(path, opts)
+ self.lib.reset(commitish, opts)
end
def commit(message, opts = {})
@@ -172,11 +172,20 @@ module Git
self.lib.checkout(branch, opts)
end
+ def merge(branch, message = 'merge')
+ self.lib.merge(branch, message)
+ end
+
# convenience methods
def revparse(objectish)
self.lib.revparse(objectish)
end
+
+ def current_branch
+ self.lib.branch_current
+ end
+
end