On Thu, Jul 11, 2013 at 10:49 AM, Chris Peterson <cpeter...@mozilla.com> wrote: > Can you describe your "patch queue"-like workflow using git? git rebase -i > lets you reorder commits, but how do you quickly do the equivalent of hg > qpopping and qpushing a bunch of commits?
What I normally do is make the change in the working directory, commit it as a temporary commit, then use interactive rebase to fold it into the final commit I want the change to belong too. When working on multiple patches for a bug these are all separate commits and I'm committing/folding/resetting as needed. And if I make a mistake there's the reflog to recover from or I can just create a new branch if I'm going to do major surgery to the commits, allowing me to go back to the old branch if I change my mind. -- http://www.bluishcoder.co.nz _______________________________________________ dev-platform mailing list dev-platform@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-platform
