$ git checkout HEAD~6 # or some other thing that gets you in this state $ hack hack hack $ webkit-patch upload MYBUGNUM Are you sure you want to continue? [Y/n]: There are 6 local commits and working copy changes. Do one of the following: 1) Use --squash or --no-squash 2) git config webkit-patch.squash true/false There are 6 local commits and working copy changes. Do one of the following: 1) Use --squash or --no-squash 2) git config webkit-patch.squash true/false ==== So (a) the error message is confusing (I don't have 6 local commits), and (b) it could perhaps suggest rebasing onto origin or whatever.
Slightly different symptoms, but same root cause as 38852. *** This bug has been marked as a duplicate of bug 38852 ***