doc/classes/Git/Branch.src/M000073.html

   1 <?xml version="1.0" encoding="iso-8859-1"?>
   2 <!DOCTYPE html
   3      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   4      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   5
   6 <html>
   7 <head>
   8   <title>merge (Git::Branch)</title>
   9   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
  10   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
  11 </head>
  12 <body class="standalone-code">
  13   <pre><span class="ruby-comment cmt"># File lib/git/branch.rb, line 62</span>
  14     <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>)
  15       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">branch</span>
  16         <span class="ruby-identifier">in_branch</span> <span class="ruby-keyword kw">do</span>
  17           <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span>, <span class="ruby-identifier">message</span>)
  18           <span class="ruby-keyword kw">false</span>
  19         <span class="ruby-keyword kw">end</span>
  20         <span class="ruby-comment cmt"># merge a branch into this one</span>
  21       <span class="ruby-keyword kw">else</span>
  22         <span class="ruby-comment cmt"># merge this branch into the current one</span>
  23         <span class="ruby-ivar">@base</span>.<span class="ruby-identifier">merge</span>(<span class="ruby-ivar">@name</span>)
  24       <span class="ruby-keyword kw">end</span>
  25     <span class="ruby-keyword kw">end</span></pre>
  26 </body>
  27 </html>