If you had pulled from the fedora repository in the last 10 days, here is how you can fix your feature branch:
First, reset your master branch to the current commit: $ git checkout master $ git reset --hard 7c058521 $ git pull This should get you to commit 2fae42ec. Now, rename your old feature branch and create a new clean one: $ git branch -m dev/feature dev/feature_broken $ git checkout -b dev/feature Examine the commits you had in the old feature branch and cherry-pick them: $ git diff dev/feature_broken # or gitk dev/feature_broken $ git cherry-pick $commitid ... Check the diff from master: $ git checkout master $ git diff dev/feature Delete the old branch: $ git branch -D dev/feature_broken Sorry again for this. Raphaël On Thu, May 31, 2012 at 10:53 PM, Raphaël Pinson <[email protected]> wrote: > Sorry to all about that, my bad. > > The situation is back to normal. I rebased my recent patches on top of > 7c058521 and forced the push. > > I will be much more careful with my git workflow in the future. > > > Raphaël > > > > > On Thu, May 31, 2012 at 5:34 PM, David Lutterkort <[email protected]>wrote: > >> Hi, >> >> a few commits were pushed on the master branch without any commit >> messages by mistake. To fix that, I will ask #fedora-admin to reset the >> master branch to commit 7c058521 >> >> I know modifying public branches is nasty, but seeing how we now have 10 >> commits without any comment, I hope it won't be too upsetting. >> >> David >> >> >> _______________________________________________ >> augeas-devel mailing list >> [email protected] >> https://www.redhat.com/mailman/listinfo/augeas-devel >> > >
_______________________________________________ augeas-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/augeas-devel
