From fb449539f5f539e2ddee7c7a68dc42588bf792f6 Mon Sep 17 00:00:00 2001 From: Daniel Mahon Date: Sat, 21 Apr 2012 20:37:48 -0400 Subject: [PATCH 1/2] Added merge method --- src/repo.coffee | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/repo.coffee b/src/repo.coffee index fbbb2b1..cde4321 100644 --- 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 - String name of the source + # callback - Receives `(err)`. + # + remote_merge: (name, callback) -> + @git "erge", {}, name + , (err, stdout, stderr) -> + callback err # Public: Get the repository's status (`git status`). # From 248a787083556f0ad794dbc076ecfc25b7705f80 Mon Sep 17 00:00:00 2001 From: Daniel Mahon Date: Sat, 21 Apr 2012 21:01:36 -0400 Subject: [PATCH 2/2] fixed typo --- src/repo.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/repo.coffee b/src/repo.coffee index b0da307..48efa14 100644 --- a/src/repo.coffee +++ b/src/repo.coffee @@ -118,8 +118,8 @@ module.exports = class Repo # name - String name of the source # callback - Receives `(err)`. # - remote_merge: (name, callback) -> - @git "erge", {}, name + merge: (name, callback) -> + @git "merge", {}, name , (err, stdout, stderr) -> callback err