Skip to content

Commit

Permalink
Merge pull request #2 from danielmahon/master
Browse files Browse the repository at this point in the history
Added git merge method
  • Loading branch information
sentientwaffle committed Apr 25, 2012
2 parents a92e358 + 248a787 commit aacfe2a
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/repo.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ module.exports = class Repo
, (err, stdout, stderr) ->
callback err

# Public: `git merge <name>`.
#
# name - String name of the source
# callback - Receives `(err)`.
#
merge: (name, callback) ->
@git "merge", {}, name
, (err, stdout, stderr) ->
callback err

# Public: Get the repository's status (`git status`).
#
Expand Down

0 comments on commit aacfe2a

Please sign in to comment.