<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hello,<br>
<br>
<div class="moz-cite-prefix">On 6/26/12 10:47 PM, Ricardo Martinez
wrote:<br>
</div>
<blockquote
cite="mid:51f9a22b6f643946582e7e7f023d47df@mail.gmail.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=ISO-8859-1">
<meta name="Generator" content="Microsoft Word 14 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:"Trebuchet MS";
panose-1:2 11 6 3 2 2 2 2 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
pre
{mso-style-priority:99;
mso-style-link:"HTML con formato previo Car";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";}
span.EstiloCorreo17
{mso-style-type:personal-compose;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.HTMLconformatoprevioCar
{mso-style-name:"HTML con formato previo Car";
mso-style-priority:99;
mso-style-link:"HTML con formato previo";
font-family:"Courier New";
mso-fareast-language:ES-CL;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri","sans-serif";
mso-fareast-language:EN-US;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 3.0cm 70.85pt 3.0cm;}
div.WordSection1
{page:WordSection1;}
--></style>
<div class="WordSection1">
<p class="MsoNormal"><span lang="EN-US">Hello.</span></p>
<p class="MsoNormal"><span lang="EN-US">Can someone help me on
how to update a module patch using GIT?</span></p>
<p class="MsoNormal"><span lang="EN-US">I need to update the
module dialog…..</span></p>
<p class="MsoNormal"><span lang="EN-US">Currently I have the
directory </span></p>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<p class="MsoNormal"><span style="font-family:"Courier
New"" lang="EN-US">/usr/local/src/kamailio-3.2</span></p>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<p class="MsoNormal"><span lang="EN-US">And under this I have </span></p>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<p class="MsoNormal"><span style="font-family:"Courier
New"" lang="EN-US">kamailio/</span></p>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<p class="MsoNormal">
<span lang="EN-US">all this was created using : </span></p>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<div style="border:dashed #aabb88 1.0pt;padding:6.0pt 6.0pt
6.0pt 6.0pt;background:#eeeedd">
<p class="MsoNormal"
style="margin-bottom:12.0pt;text-align:justify;background:#eeeedd;border:none;padding:0cm"><span
style="font-size:9.0pt;font-family:"Courier
New";color:black" lang="EN-US">git clone --depth 1
<a class="moz-txt-link-freetext" href="git://">git://</a><a moz-do-not-send="true"
href="http://git.sip-router.org/sip-router">git.sip-router.org/sip-router</a>
kamailio</span></p>
<p class="MsoNormal"
style="margin-bottom:12.0pt;text-align:justify;background:#eeeedd;border:none;padding:0cm"><span
style="font-size:9.0pt;font-family:"Courier
New";color:black" lang="EN-US"> cd kamailio</span></p>
<p class="MsoNormal"
style="margin-bottom:12.0pt;text-align:justify;background:#eeeedd;border:none;padding:0cm"><span
style="font-size:9.0pt;font-family:"Courier
New";color:black" lang="EN-US"> git checkout -b 3.2
origin/3.2</span></p>
</div>
<p class="MsoNormal"><span lang="EN-US"> </span></p>
<p class="MsoNormal"><span lang="EN-US">I’ll appreciate any
help.</span></p>
</div>
</blockquote>
<br>
perhaps you look for git cherry-pick command, to get a commit from a
branch to another one, some guidelines exemplified with 3.2 at:<br>
<br>
<a class="moz-txt-link-freetext" href="http://www.kamailio.org/wiki/devel/backporting-to-3.2.x">http://www.kamailio.org/wiki/devel/backporting-to-3.2.x</a><br>
<br>
It is working only if that commit was not already
backported/cherry-picked to that branch, otherwise will get
conflicts.<br>
<br>
You can pull only master branch instead of all origin branches, in
this way the 3.2 branch will not be updated from remote.<br>
<br>
Cheers,<br>
Daniel<br>
<br>
<pre class="moz-signature" cols="72">--
Daniel-Constantin Mierla - <a class="moz-txt-link-freetext" href="http://www.asipto.com">http://www.asipto.com</a>
<a class="moz-txt-link-freetext" href="http://twitter.com/#!/miconda">http://twitter.com/#!/miconda</a> - <a class="moz-txt-link-freetext" href="http://www.linkedin.com/in/miconda">http://www.linkedin.com/in/miconda</a>
Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - <a class="moz-txt-link-freetext" href="http://asipto.com/u/katu">http://asipto.com/u/katu</a>
Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - <a class="moz-txt-link-freetext" href="http://asipto.com/u/kpw">http://asipto.com/u/kpw</a></pre>
</body>
</html>