-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Stepan Kasal on 11/16/2007 3:36 PM: > Unfortunately, I forgot to add a changelog entry, so I pushed another > commit to fix that. > > Then I tried to correct that and "reset" the remote repo. > I tried git-reset and "git-push -f" but the server has refused that. > That did not work.
Just leave it as two commits. Rewinding history on the master branch is discouraged, for a reason - it makes it harder to track for people that already pulled the old commit. (Yes, it is technically possible to do, but I'm not going to disclose how to do it on this branch; last time we tried rewinding autoconf history, we hit a glitch, and it took nearly an hour to get the repository back into the desired state). - -- Don't work too hard, make some time for fun as well! Eric Blake [EMAIL PROTECTED] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHPiFb84KuGfSFAYARAi//AJ9UqJIm6MX9QbRkHEujr4sOEfPkrwCePpIu sBZ2rk9bLCA2MuI9GUNCZ88= =svDI -----END PGP SIGNATURE-----
