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


Hello there,

On Thu, 2012-08-02 at 08:14 -0700, Joel Madero wrote:
Perfect idea! I'm going to go ahead and work on that. I will take out
"limited" (I have no clue what it means either, I figured someone else
must have known when they added it ;)).

Well, hopefully, I didn't sound overly assertive here.

I have a quick question though. What's the best way to modify a patch?
The only way I know how is to go back to dismiss my changes and start
from scratch. I'm sure there is a better way that I don't know of.

So, I am by no means the git expert here (I still barely understand the
basics of it) but ... you probably still have the original patch
committed locally, (and if not, you can do
$ git am path/to.patch
), so, do all the modifications you want to do, then do the usual
$ git add .
$ git commit
At the end, you can just use
$ git rebase -i HEAD~2
to either squash (merge the commits and edit the commit message) or
fixup (just merge the commits) (assuming you had only your original
commit and the new one = HEAD~2).

Also: Note that you should only ever use rebase -i on local commits –
modifying the global commit history is evil. (It won't do any harm to
everyone else, if you don't have commit access, but still.)

Modifying the patch in a text editor can easily go wrong, so that's not
recommended.

Astron.


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.