From b81ee9305f418209ba0d77fbb7b47b23d4b121ca Mon Sep 17 00:00:00 2001
From: scott Chacon <schacon@agadorsparticus.(none)>
Date: Sun, 11 Nov 2007 14:37:05 -0800
Subject: added merging functions

---
 EXAMPLES | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'EXAMPLES')

diff --git a/EXAMPLES b/EXAMPLES
index 4a8d185..233cc7c 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -105,16 +105,17 @@ g.branch('existing_branch').checkout
 g.checkout('new_branch')
 g.checkout(g.branch('new_branch'))
 
-
-***** IMPLEMENTED *****
-
 g.branch(name).merge(branch2)
-g.branch(branch2).merge
+g.branch(branch2).merge  # merges HEAD with branch2
 
+g.branch(name).in_branch(message) { # add files }  # auto-commits
 g.merge('new_branch')
-g.merge(Git::Branch)
-g.merge(Git::Branch, Git::Branch)
-g.merge(Git::Remote)
+g.merge('origin/remote_branch')
+g.merge(b.branch('master'))
+g.merge([branch1, branch2])
+
+
+***** IMPLEMENTED *****
 
 g.add_remote(uri, name)  # Git::Remote
 g.remotes
-- 
cgit