Merge branch 'master' of github.com:sentientwaffle/gift

notatestuser · Apr 25, 2012 · 6b759b7 · 6b759b7
2 parents 75114c5 + aacfe2a
commit 6b759b7
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/repo.coffee b/src/repo.coffee
@@ -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`).
   #