Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi Emanuele,

2011/11/3 Emanuele Fia <emanuele.fia@gmail.com>:
git reset -hard HEAD~1 # warning this looses the head commit
before running ./g pull -r to avoid conflicts (assuming you didn't do
any more commits yet).

This is for reset my local repo and restore the current version on git
repository ?

You need 'git reset --hard HEAD~1' since committer modified your patch
(HEAD in your local history). You need to reset a history to a
previous commit - HEAD's parent ('HEAD~1' or 'HEAD^'). Then it is
possible to perform git pull without any conflicts.
By the way, the great book about git: http://progit.org/book/

A thing that really helps us, is if you could send a mail to the list
with a blanket license for your commits: of the form you can see linked
into the developers wiki here:

Ok , where i can find infromation about  MPL/LGPLv3+ ?

For example here: http://opensource.org/licenses/alphabetical

But how i can submit patch ? Send an email to this maillist and stop?
Why stop? You are able to continue! :-)

My last patch is "formatted" correctly?
Yes it is, however your email address looks weird... Probably you need
    $ git config --global user.email emanuele.fia@gmail.com

Regards,
        Ivan

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.