Sha256: b0645b04f9dfa8fa29c7368117c3f51577aff934e85e41d3962d7c7fbb2d7a1e
Contents?: true
Size: 1.66 KB
Versions: 5
Compression:
Stored size: 1.66 KB
Contents
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>merge (Git::Branch)</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
</head>
<body class="standalone-code">
<pre><span class="ruby-comment cmt"># File lib/git/branch.rb, line 62</span>
<span class="ruby-keyword kw">def</span> <span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">message</span> = <span class="ruby-keyword kw">nil</span>)
<span class="ruby-keyword kw">if</span> <span class="ruby-identifier">branch</span>
<span class="ruby-identifier">in_branch</span> <span class="ruby-keyword kw">do</span>
<span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span>, <span class="ruby-identifier">message</span>)
<span class="ruby-keyword kw">false</span>
<span class="ruby-keyword kw">end</span>
<span class="ruby-comment cmt"># merge a branch into this one</span>
<span class="ruby-keyword kw">else</span>
<span class="ruby-comment cmt"># merge this branch into the current one</span>
<span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-ivar">@name</span>)
<span class="ruby-keyword kw">end</span>
<span class="ruby-keyword kw">end</span></pre>
</body>
</html>
Version data entries
5 entries across 5 versions & 1 rubygems