Re: [gpsd-dev] [PATCH v1 1/1] gps2udp: do not send out JSON when not configured to do so

[Bernd Zeimetz]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 01/03/2014 10:47 PM, Gary E. Miller wrote:
> Yo Eric!
> 
> On Fri, 3 Jan 2014 16:31:22 -0500 "Eric S. Raymond" <address@hidden>
> wrote:
> 
>> Gary E. Miller <address@hidden>:
>>> Maybe the --author option to git commit?
>> 
>> Yes, that is the right thing given your preferred workflow.
> 
> Any way to fix a prior commit?

No, (luckily!) there is no way to rewrite commit history without breaking the
repository.

git am is the easiest way, preferable
git am -s patchfile
(assuming patchfile was created with something like git format-patch)

Using the -s on git am results in a 'Signed-Off' line in the git commit, so it
is obvious who looked at the commit ;)

If you figure out that you want to revert the changes, use git reset (maybe
with --hard) to go back - or use a local branch to test the commit(s) and then
merge the branch to master and push it.


- -- 
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iQIcBAEBCAAGBQJS0yQiAAoJEOs2Fxpv+UNfjjEP/1+qMzrpE9Vmgh+wCjAvHSeJ
T053+zKa20yUONfyXJWuicb4YniuV/4A15Wwzg1MwWWSBTXPCi15FteKg/LbDAMR
mbNnhiFMbc1IFs5qys7jfaQ4FpF3shY4JRRFTkgLT9bEkyFAA8RJwkL+G9LpJ+K8
NXcDSV8IKVWZHyJUuJQmRsE2MQe9LMBpLEW3Tdht48VNCrcDyzDSihK0VvaJRjHH
guA7PJVDOHaVE7dqs+wt1yC05eTzS89MYGD2xw3EvSLgHrnE83yKU1Uq/nTjqEw5
sOxjza4+k2TX2cf1CbRAP1VnW5JuJsZL9WuBqehEptUpYj8QGckChAgPWfqbrynb
n9fPP8gNCLYriG3K2LafPDwoR4qxzz52pm8pBJjiiIJjwsxK3pUQrbWQewvLPAIx
UtLso0rR/b1h+cpNa58Pq04abRvEkU6KhhtBQybQ8+TLoodfySIxu+zLOFp71Iyi
5GBpnG2N7HbpuhLZ2a8GmIdOiCeVDx10GbpApNuc7gOMAVGD4mj0j8hqn2NW5BXu
Yl9a4N/rnhjK+RzKErYQ8MhGBJbChOrAxoBa46E6uBUgpLmpM8O4QRXUzM0KTK5J
vEBEYtU2Au+aoA2bYXc6ppBh+8GSI/txoiknwvyYF+Hj0nnyEfJ17ffZ8NyNBQWk
TSFOzeXKCFEQp0JRM123
=sVRZ
-----END PGP SIGNATURE-----