[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [PATCH] virsh: fix non-literal string format



On 11/09/2010 04:03 PM, Eric Blake wrote:
> On 11/09/2010 02:06 PM, Laine Stump wrote:
>> I just pushed this under the trivial rule.
>>
>> These are in the newly added -V output.
>> ---
>>  tools/virsh.c |   10 +++++-----
>>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> Admin note - Laine and I just rebased libvirt.org to fix up 'make
> syntax-check' by altering a botched commit message.
> 
> If you happened to pull from libvirt.org during the one hour window
> where commit 0341fc9 was live, then you will see something like this the
> next time you pull:
> 
>  + 0341fc9...ff4a31d master     -> origin/master  (forced update)
> 
> if you also see a merge commit, then simply running 'git rebase' will
> fix things up so that you're back in sync with the state of the latest
> upstream.

Clarification: your choice of 'git pull --rebase', or 'git pull && git
rebase origin'.

-- 
Eric Blake   eblake redhat com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]