On 03/25/2012 11:10 AM, Enrico Forestieri wrote:
On Sun, Mar 25, 2012 at 04:36:40PM +0200, Vincent van Ravesteijn wrote:
Op 25-3-2012 15:52, for...@lyx.org schreef:
Author: Enrico Forestieri<for...@lyx.org>
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.
Ok, thanks. But next time I will first get a diff with "git diff> file"
and then will use patch to apply the diff. If the patch does not apply
cleanly I know what to do, contrarily to using git in case of clashes.
Even the cherry-pick thing took almost a hour to figure out. I was using
a sha1 of the commit but git was complaining:
$ git cherry-pick -x d728575b
error: could not apply d728575... Punctuation + some shortcuts
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add<paths>' or 'git rm<paths>'
hint: and commit the result with 'git commit'
Eh? what does that mean? It was such a simple one-liner that it is
difficult to imagine any problem could arise. After reading several
man pages and issuing some obscure commands I understood that the
wrong commit was being cherry-picked! But I was said that the sha1
uniquely determines a commit...
Where did you get the SHA1? I always do:
git log master
before trying to cherry-pick, and get the SHA1 from there. Or you
can do the sort of thing you ended up doing.
It took me 10 minutes to master svn, the same is not true for git. In the
end, I lost almost 1 hour to do what would have taken 2 minutes with svn.
I'm sorry but I'm not paid for mastering git and don't have a couple of
days for reading the git documentation to be able to do such simple things.
I agree that git is more complicated than svn, but that is because it is
a lot more powerful. But it isn't that much more complicated. Most of
what needs doing can be boiled down to simple recipes, which I'm
trying to collect.
Richard
