diff options
| author | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
|---|---|---|
| committer | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
| commit | b81ee9305f418209ba0d77fbb7b47b23d4b121ca (patch) | |
| tree | f4bef02a3befcbe06be85ff8507cb18242df5f40 /EXAMPLES | |
| parent | abcb1453e210beb6de70a69d3501cf842b38636e (diff) | |
| download | third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.gz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.xz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.zip | |
added merging functions
Diffstat (limited to 'EXAMPLES')
| -rw-r--r-- | EXAMPLES | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -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 |