git rebase -i master on development is your friend.<br><br><div class="gmail_quote">On Fri Dec 12 2014 at 9:59:27 AM Kumar Amit Mehta <<a href="mailto:gmate.amit@gmail.com">gmate.amit@gmail.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
I know that it's not a typical Linux kernel related query but I reckon<br>
that people involved in Linux kernel testing/development might have<br>
gotten into similar situation. So, please bear with me for this rather<br>
generic framework related query.<br>
<br>
The scenario:<br>
1: Cloned linux-next at time T1<br>
$ git clone blahblah<br>
<br>
2: Created a branch called development at T2<br>
$ git checkout -b development<br>
<br>
3: Made change1 in development branch and did a commit at T3<br>
$ git commit -a<br>
<br>
4: Made another commit in development branch and did another commit<br>
at time T4, but during this development phase, *some* of the changes<br>
that I made during my previous commit at time T3 were wrong, so had to<br>
remove *some* of the changes<br>
$ git commit -a<br>
<br>
5: Now I create a branch called test, based off the master<br>
$ git checkout -b test origin/master<br>
<br>
5: So my test branch(and also the master branch) is two commits behind the<br>
development branch. Now I wish to create a patch, based on my changes in<br>
development branch and apply that patch to my test branch for further<br>
testing.<br>
<br>
$ git format-patch origin/master -o patches<br>
The above command creates two patches, which I need to apply in an<br>
increasing order(0001 ---> 0002), otherwise, the patch won't work.<br>
<br>
So far so good, but what If, I am not particularly proud of the first<br>
patch, but have to send that anyway, If my patches are to be applied.<br>
Another approach would be to create another branch, say development-again,<br>
based of origin/master and make the necessary changes and then just<br>
create one patch file. But I was wondering that while doing development,<br>
don't we make commits in our working branches, which we think is<br>
correct, only to find it ridiculous later (say after few more commits<br>
in future) ? And what to do in such scenario ? Or how to use git to<br>
solve such scenario.<br>
<br>
Thanks,<br>
Kumar<br>
<br>
______________________________<u></u>_________________<br>
Kernelnewbies mailing list<br>
<a href="mailto:Kernelnewbies@kernelnewbies.org" target="_blank">Kernelnewbies@kernelnewbies.<u></u>org</a><br>
<a href="http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies" target="_blank">http://lists.kernelnewbies.<u></u>org/mailman/listinfo/<u></u>kernelnewbies</a><br>
</blockquote></div>