[Gta04-owner] [PATCH] gta04-voice: fix gtm601 registration order

Dr. H. Nikolaus Schaller hns at goldelico.com
Mon Sep 5 22:19:09 CEST 2011


Am 05.09.2011 um 22:13 schrieb David Lanzendörfer:

>> $ git revert 0fc9f0f41e9b700f563209e5deed7f89ba350962 a0c995cb459e6df3928b6f155b6d44c57b9c1602
>> 
>> However, I havn't looked at the code, so if you only want to revert
>> parts of that change, you'll probably have to do that manually.
> 
> git show 0fc9f0f41e9b700f563209e5deed7f89ba350962
> 
> and git show a0c995cb459e6df3928b6f155b6d44c57b9c1602
> 
> may give you a hint what might have changed...

Unfortunately, the first one only shows how the files were initially
added and the second one shows nonsense since it was
the result of a manual repair after a failed git am --abort.

So the easiest way would be to get a fresh copy of the whole
file, overwrite it and let git find out what has been modified to
whatever state it thinks it has.

Nikolaus



More information about the Gta04-owner mailing list