diff options
| author | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
|---|---|---|
| committer | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
| commit | b81ee9305f418209ba0d77fbb7b47b23d4b121ca (patch) | |
| tree | f4bef02a3befcbe06be85ff8507cb18242df5f40 /lib/git/base.rb | |
| parent | abcb1453e210beb6de70a69d3501cf842b38636e (diff) | |
| download | third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.gz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.xz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.zip | |
added merging functions
Diffstat (limited to 'lib/git/base.rb')
| -rw-r--r-- | lib/git/base.rb | 11 |
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 |