Dec. 12, 2014
3:43 p.m.
Kumar Amit Mehta <gmate.amit@gmail.com> writes:
So far so good, but what If, I am not particularly proud of the first patch, but have to send that anyway, If my patches are to be applied. Another approach would be to create another branch, say development-again, based of origin/master and make the necessary changes and then just create one patch file. But I was wondering that while doing development, don't we make commits in our working branches, which we think is correct, only to find it ridiculous later (say after few more commits in future) ? And what to do in such scenario ? Or how to use git to solve such scenario.
git rebase is made for things like this. See http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History Bjørn