-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Karl Berry on 3/12/2008 4:45 PM: | I think I inadvertently messed up the git commit again (committed before | pulling on trunk). I don't remember the terminology, sorry. Anyway, I | took more steps to hopefully avoid this in the future.
In the upcoming git 1.5.5 release, you can do "git config branch.master.rebase true" to automatically rebase local changes on top of upstream changes, if you happen to commit before pulling. - -- Don't work too hard, make some time for fun as well! Eric Blake [EMAIL PROTECTED] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkfYluYACgkQ84KuGfSFAYCwugCcD1CulH+TWYo23zk1kej50RSp d+cAn066jKfDPGWeqsLGsQCEoogBhCMM =38xg -----END PGP SIGNATURE-----
