[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Re: commit from master to branch kde 4.8
From:       Shaun Reich <shaun.reich () kdemail ! net>
Date:       2011-12-29 0:55:51
Message-ID: CADVynFBexUZHqh9q7=dhdAZ0N8ZA0S=kg2Vcp3zB36fR36nyjg () mail ! gmail ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


On Wed, Dec 28, 2011 at 7:25 PM, Reza Shah <rshah0385@kireihana.com> wrote:

> I committed below to master, at that time i do not have KDE/4.8.
> 
> https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/8a03179be64f2dfb3fc6b52b38b0c7ba0d680dfa
>  
> My purpose was to include my changes for new release of KDE SC 4.8.
> 
> Does anyone can commit this also to branch KDE/4.8?
> Or please let me know how to do that?
> 

'git checkout -t -b 4.8 origin/KDE/4.8'
'git cherry-pick <sha of your commit from master'
'git push origin 4.8:KDE/4.8'

That should backport your change to the 4.8 branch, and I'm sure I'm going
to have 10 people replying to this screaming "MERGE DONT CHERRY PICK!!"

warning: I'm a git newbie as well ;p

-- 
Shaun Reich,
KDE Software Developer (kde.org)


[Attachment #5 (text/html)]

<div class="gmail_quote">On Wed, Dec 28, 2011 at 7:25 PM, Reza Shah <span \
dir="ltr">&lt;<a href="mailto:rshah0385@kireihana.com" \
target="_blank">rshah0385@kireihana.com</a>&gt;</span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">


I committed below to master, at that time i do not have KDE/4.8.<br>
<a href="https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/8a03179be64f2dfb3fc6b52b38b0c7ba0d680dfa" \
target="_blank">https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/8a03179be64f2dfb3fc6b52b38b0c7ba0d680dfa</a><br>




<br>
My purpose was to include my changes for new release of KDE SC 4.8.<br>
<br>
Does anyone can commit this also to branch KDE/4.8?<br>
Or please let me know how to do that?<br></blockquote><div><br>&#39;git checkout -t \
-b 4.8 origin/KDE/4.8&#39;<br>&#39;git cherry-pick &lt;sha of your commit from \
master&#39;<br>&#39;git push origin 4.8:KDE/4.8&#39;<br><br>


That should backport your change to the 4.8 branch, and I&#39;m sure I&#39;m going to \
have 10 people replying to this screaming &quot;MERGE DONT CHERRY \
PICK!!&quot;<br><br>warning: I&#39;m a git newbie as well ;p<br> <br>


</div></div>-- <br>Shaun Reich,<br>KDE Software Developer (<a href="http://kde.org" \
target="_blank">kde.org</a>)<br>



_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel


[prev in list] [next in list] [prev in thread] [next in thread]