summaryrefslogtreecommitdiffstats
path: root/EXAMPLES
diff options
context:
space:
mode:
authorscott Chacon <schacon@agadorsparticus.(none)>2007-11-11 12:21:30 -0800
committerscott Chacon <schacon@agadorsparticus.(none)>2007-11-11 12:21:30 -0800
commitabcb1453e210beb6de70a69d3501cf842b38636e (patch)
tree0612905ab3ec279694d2780b43274cb332757d1a /EXAMPLES
parent3cb57d82c301e9b8a16f30f468401e3007845bb7 (diff)
downloadthird_party-ruby-git-abcb1453e210beb6de70a69d3501cf842b38636e.tar.gz
third_party-ruby-git-abcb1453e210beb6de70a69d3501cf842b38636e.tar.xz
third_party-ruby-git-abcb1453e210beb6de70a69d3501cf842b38636e.zip
added branch and checkout functionality
Diffstat (limited to 'EXAMPLES')
-rw-r--r--EXAMPLES25
1 files changed, 18 insertions, 7 deletions
diff --git a/EXAMPLES b/EXAMPLES
index 9d05965..4a8d185 100644
--- a/EXAMPLES
+++ b/EXAMPLES
@@ -97,22 +97,33 @@ end
g.reset # defaults to HEAD
g.reset_hard(Git::Commit)
-
-***** IMPLEMENTED *****
-
-g.branch('new_branch')
+g.branch('new_branch') # creates new or fetches existing
+g.branch('new_branch').checkout
g.branch('new_branch').delete
+g.branch('existing_branch').checkout
g.checkout('new_branch')
-g.checkout('new_branch', :create_branch => true)
-g.checkout_b('new_branch')
+g.checkout(g.branch('new_branch'))
+
+
+***** IMPLEMENTED *****
+
+g.branch(name).merge(branch2)
+g.branch(branch2).merge
g.merge('new_branch')
g.merge(Git::Branch)
g.merge(Git::Branch, Git::Branch)
+g.merge(Git::Remote)
+
+g.add_remote(uri, name) # Git::Remote
+g.remotes
+g.remote(name).fetch
+g.remote(name).merge
+g.remote(name).merge(branch)
g.fetch
-g.fetch(Git::Repo)
+g.fetch(Git::Remote)
g.pull
g.pull(Git::Repo, Git::Branch) # fetch and a merge