<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content="text/html; charset=utf-8" http-equiv=Content-Type>
<STYLE>
BLOCKQUOTE {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px; MARGIN-LEFT: 2em
}
OL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
UL {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
P {
MARGIN-TOP: 0px; MARGIN-BOTTOM: 0px
}
BODY {
LINE-HEIGHT: 1.5; FONT-FAMILY: 微软雅黑; COLOR: #000000; FONT-SIZE: 10.5pt; 36719: ; 38597: ; 40657:
}
</STYLE>
<META name=GENERATOR content="MSHTML 8.00.7601.17514"></HEAD>
<BODY style="MARGIN: 10px">
<DIV>Well, Eric, I've created a workbranch, maybe I need to do the rebase
operation.</DIV>
<DIV>I thought that's just ok to follow the steps where <A
href="http://libvirt.org/hacking.html">http://libvirt.org/hacking.html</A>
says:</DIV>
<DIV>
<DIV> git checkout master</DIV>
<DIV> git pull</DIV>
<DIV> git checkout -t origin -b workbranch</DIV>
<DIV>...modify on workbranch...</DIV>
<DIV> git pull --rebase</DIV>
<DIV> ./autogen.sh</DIV>
<DIV> ./configure --enable-werror</DIV>
<DIV> make check</DIV>
<DIV> make syntax-check
<DIV> make -C tests valgrind</DIV>
<DIV> git pull --rebase</DIV>
<DIV> git send-email ...</DIV>
<DIV> </DIV>
<DIV>Maybe I need to do a "git rebase -i orgin" before send-email, Right?</DIV>
<DIV>So What should I do now? Modify the commit message and send again?</DIV>
<DIV> </DIV>
<DIV>Thanks.</DIV></DIV>
<DIV> </DIV></DIV>
<DIV>On 2013-09-17 23:04 , <A href="mailto:eblake@redhat.com">Eric
Blake</A> wrote:</DIV>
<DIV>
<TABLE width="100%">
<TBODY>
<TR>
<TD width="100%">
<BLOCKQUOTE
style="BORDER-LEFT: #000000 2px solid; PADDING-LEFT: 5px; PADDING-RIGHT: 0px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 0px">
<DIV>On 09/17/2013 08:57 AM, hzguanqiang@corp.netease.com wrote:</DIV>
<DIV>> Please ignore the patchs [1-3].</DIV>
<DIV>> I followed the contributer guidelines, before I push the
patches I did a "git pull --rebase" operation, </DIV>
<DIV>> Then the newest three patches are included into my
patches. Are there anything I missed?</DIV>
<DIV> </DIV>
<DIV>That generally means you applied some patches locally without
creating a</DIV>
<DIV>new branch. If you want to discard non-upstream patches that
are</DIV>
<DIV>unrelated to what you are working on, you can do 'git rebase -i'
(if</DIV>
<DIV>your git version is too old, you might have to spell it 'git rebase
-i</DIV>
<DIV>origin'), and delete the lines for the patches you are no
longer</DIV>
<DIV>interested in.</DIV>
<DIV> </DIV>
<DIV>-- </DIV>
<DIV>Eric Blake eblake redhat com
+1-919-301-3266</DIV>
<DIV>Libvirt virtualization library http://libvirt.org</DIV>
<DIV> </DIV>
<DIV> </DIV></BLOCKQUOTE></TD></TR></TBODY></TABLE></DIV>
<DIV> </DIV>
<DIV><SPAN>
<DIV style="FONT-FAMILY: verdana; FONT-SIZE: 10pt">
<DIV>------------------ <BR>Best
regards!<BR>GuanQiang</DIV></DIV></SPAN></DIV>
<DIV>23:06:36</DIV></BODY></HTML>