Re: [PATCH]fdo#52636:VIEWING: unintuitive Heading for 'Enable experimental Features

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.