On Fri, 15 May 2015 at 18:30:10 +0200, Christophe CURIS wrote: > > I gave a try to a new method for merging the patch which should be easier > for you: after the 'git am', you can use: > git rebase -i --autosquash next~20 > > It will detect the 'fixup!' string and move the commit to the appropriate > place for you, you'll just have to accept (after review, because the '-i' > looks to not be optional).
Wow! I wasn't aware of this trick, it is very convenient! Thank you very much for doing this. Manually finding the commits to fix, counting how many patches I needed to go backwards in the rebase and moving the new patches right after them was not an enjoyable task. Thank you! -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
