# HG changeset patch
# User Jeff Hammel <k0scist@gmail.com>
# Date 1393978777 28800
# Node ID 3059ee249888f08f79e85f4f6a31d229c73fee07
# Parent  3be3b16aeda02f406b1c0b69c9b7163cbe2f37ee
STUB: python/git_merge_master.py

diff -r 3be3b16aeda0 -r 3059ee249888 python/git_merge_master.py
--- a/python/git_merge_master.py	Tue Mar 04 11:19:19 2014 -0800
+++ b/python/git_merge_master.py	Tue Mar 04 16:19:37 2014 -0800
@@ -31,6 +31,17 @@
         merge_base = subprocess.check_output(['git', 'merge-base', 'HEAD', 'master']).strip()
         return subprocess.check_output(['git', 'diff', merge_base])
 
+    def checkout(self, branch):
+        subprocess.check_output(['git', 'checkout', branch])
+
+    def pull(self, branch='master'):
+        current_branch = self.branch()
+        if current_branch != branch:
+            self.checkout(branch)
+        subprocess.check_output(['git', 'pull', 'origin', branch])
+        if current_branch != branch:
+            self.checkout(current_branch)
+
     def merge(self):
         pass