On Tue, 14 Jul 2015 01:58:32 +0200, Jonas Bernoulli <[email protected]> wrote:
>> I'm fairly new to both Git and Magit. > While it would probably be possible to do all that is required using > Magit, I strongly recommend you stick to the command line to fix this > issue. An emergency isn't the best time to learn about two new tools. > This is also not the best place to ask such a question. For example I > know next to nothing about `git subtree'. I recommend you ask on > http://superuser.com instead. But some tips to get you started: > 0. Make sure you don't make the situation worse. > cp -r /path/to/project /path/to/project.backup > This will allow you to start over in case you make the situation > worse while attempting to fix it. Do NOT use `git clone' for this! > 1. Remove the things that should not have been pushed as quickly as > possible. Don't listen to people who tell you that you should never > do that. "Changing published history" should be avoided, but from the > little information you provided, it sounds like this is one of those > cases when you should do it. > a) Determine the commit before the mistake, I suggest using `gitk > --branches' to find it. > b) "Rewind" the "master" branch on the remote: > git push origin --force hashoflastgoodcommit:master Thanks for these tips and apologies if this was the wrong forum. I was able to fix this, essentially following your advice. -- Seb -- You received this message because you are subscribed to the Google Groups "magit" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
