diff options
Diffstat (limited to 'doc/classes/Git/Lib.src/M000051.html')
| -rw-r--r-- | doc/classes/Git/Lib.src/M000051.html | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/doc/classes/Git/Lib.src/M000051.html b/doc/classes/Git/Lib.src/M000051.html new file mode 100644 index 0000000..6df355b --- /dev/null +++ b/doc/classes/Git/Lib.src/M000051.html @@ -0,0 +1,21 @@ +<?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::Lib)</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/lib.rb, line 260</span> + <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>) + <span class="ruby-identifier">arr_opts</span> = [] + <span class="ruby-identifier">arr_opts</span> <span class="ruby-operator"><<</span> [<span class="ruby-node">"-m '#{message}'"</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">message</span> + <span class="ruby-identifier">arr_opts</span> <span class="ruby-operator"><<</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>) + <span class="ruby-identifier">command</span>(<span class="ruby-value str">'merge'</span>, <span class="ruby-identifier">arr_opts</span>) + <span class="ruby-keyword kw">end</span></pre> +</body> +</html>
\ No newline at end of file |