I noticed my own little git reference sheet didn't have that either, so asked in #git @ FreeNode. I haven't tried it yet, but here's the answer I got:
1) make a branch of master to keep track of commits after the merge 2) reset master to the commit before the merge 3) rebase search against master 4) merge master 5) cherry-pick those extra commits after the original merge (I assumed that you merged search into master and that you've since made other commits you want to keep.) Reminder: Until you're used to doing this, backup your repo first. On 12-09-14 11:25 PM, PCMan wrote: > Hello, > I just added file searching capability to pcmanfm/libfm. > However it is very primitive and is not finished yet. > Some parts do not work and some UI needs polishing, too. > At least this is a good start. :-) > > Source code is in 'search' branch of both pcmanfm and libfm. > Please try it. > > BTW, the search branch of pcmanfm is done using git merge. > Andriy will hate this very much, but the merge was done before he > suggest using git rebase. > I don't know how to convert the merged result to use git rebase instead. > If someone knows how to do it, please help. > > Thanks! > > ------------------------------------------------------------------------------ > How fast is your code? > 3 out of 4 devs don\\\'t know how their code performs in production. > Find out how slow your code is with AppDynamics Lite. > http://ad.doubleclick.net/clk;262219672;13503038;z? > http://info.appdynamics.com/FreeJavaPerformanceDownload.html > ------------------------------------------------------------------------------ How fast is your code? 3 out of 4 devs don\\\'t know how their code performs in production. Find out how slow your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219672;13503038;z? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ Pcmanfm-develop mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/pcmanfm-develop
