[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: script timestamps
|
From: |
Eric Blake |
|
Subject: |
Re: script timestamps |
|
Date: |
Wed, 29 Apr 2009 06:05:16 -0600 |
|
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.21) Gecko/20090302 Thunderbird/2.0.0.21 Mnenhy/0.7.6.666 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Ralf Wildenhues on 4/28/2009 11:36 PM:
>> To make sure I understand the branching rules
>> correctly, I would simply apply this first to origin/branch-1-10, then merge
>> that onto origin/master?
>
> No. branch-1-10 was started before the move to git, and I never
> fake-merged the common parts of it and master. Please commit to master,
> then cherry-pick into branch-1-10. I've just pushed a couple of pending
> cherry-picks in branch-1-10.
OK, done.
- --
Don't work too hard, make some time for fun as well!
Eric Blake address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkn4QnwACgkQ84KuGfSFAYCnVQCZAUdWEo7AELN3e7ij3TcXgBgD
itIAoJwy3jnuU6/F67mPhmKONdBeqabJ
=uJm8
-----END PGP SIGNATURE-----