Op 25-3-2012 15:52, [email protected] schreef:
Author: Enrico Forestieri<[email protected]>
Date: Sun, 25 Mar 2012 15:49:10 +0200
New Commit: ae068255137f111c598e93f9a54a891ffdb4dafc
URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=ae068255137f111c598e93f9a54a891ffdb4dafc
Log:
status.20x for last commit.
I first used cherry-pick, then tried to modify status.20x but there
was no way I found to proceed from there.
git commit -a --amend
This will add the current changes to the last commit, in this case the
cherry-picked commit.
So, to be able to come
out form this situation I reverted the changes to status.20x,
pushed the cherry-picked revision and then committed the changes
to status.20x.
The same would have happened ot just commit the changes to status.20x
and then push both at once. Let me say that git is way too much
complicated to be really useful.
Vincent
