doc/classes/Git/Lib.src/M000051.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::Lib)</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/lib.rb, line 260</span>
  14     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">merge</span>(<span class="ruby-identifier">branch</span>, <span class="ruby-identifier">message</span> = <span class="ruby-keyword kw">nil</span>)
  15       <span class="ruby-identifier">arr_opts</span> = []
  16       <span class="ruby-identifier">arr_opts</span> <span class="ruby-operator">&lt;&lt;</span> [<span class="ruby-node">&quot;-m '#{message}'&quot;</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">message</span>
  17       <span class="ruby-identifier">arr_opts</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">branch</span>.<span class="ruby-identifier">to_a</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">' '</span>)
  18       <span class="ruby-identifier">command</span>(<span class="ruby-value str">'merge'</span>, <span class="ruby-identifier">arr_opts</span>)
  19     <span class="ruby-keyword kw">end</span></pre>
  20 </body>
  21 </html>