From: skillzero@gmail.com Date: Fri, 08 Apr 2011 20:30:01 GMT Subject: git rebase --continue automatic --skip? Message-ID: Is there a way to make git rebase --continue automatically do a --skip if a conflict resolution ends up not needing the patch? Normally, git rebase will just silently skip a patch if it's not needed, but if a patch results in a conflict and I use git mergetool and end up deleting all the changes, git rebase --continue stops and makes me explicitly use --skip. It's a not a big deal, but it happens a lot to me because I do work on a branch that really should have gone on master, but I don't want to disrupt my branch work (i.e. I'm lazy) so I do it directly on the branch then later clean up those commits by isolating the parts that are truly part of the topic vs parts that are unrelated. So I hit a conflict, but want to take the version from master (so the commit disappears from the branch).