Re: [hatari-devel] [PATCH] Add joystick button index configuration

[ Thread Index | Date Index | More lists.tuxfamily.org/hatari-devel Archives ]


Eero Tamminen schrieb:

It's better to commit the changes to a local tree first and use
something like "git format-patch HEAD~1" [1] to produce the patch(es),
so they can be applied directly to Hatari Git with correct attributions.

I would propose to go even one step further. Apologies to everyone who
already knows this.

Create a new local branch for each feature that you want to work on:
"git checkout -b branch_name". Commit the changes only to your local
branch. That way, you can easily switch back and forth between the
official version and your changes for testing, by using "git checkout
master" and "git checkout branch_name".

When ready for posting the patches, get the latest version of "master"
from the repo: "git pull" while the master branch is currently checked
out or else "git fetch origin master:master". Rebase your changes on top
of the current master. You can use this moment to do an interactive
rebase instead "git rebase -i master" to squash or shuffle your commits
so they form sensible entities.

Then use "git format-patch master" to get the patch(es) to submit to the
maintainers.

Regards
Christian
--
Christian Zietz  -  CHZ-Soft  -  czietz@xxxxxxx
WWW: https://www.chzsoft.de/
New GnuPG-Key-ID: 0x8708B34C827B159E




Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/