| Re: [translations] Doc-it patch: chapter 5 of Usage |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Francisco Vila <paconet.org@xxxxxxxxx>
- Subject: Re: [translations] Doc-it patch: chapter 5 of Usage
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Sun, 24 Apr 2011 10:16:39 +0200
- Cc: translations <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:subject:from:to:cc:in-reply-to:references :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=mebgDFr2ywkY0U+Y4z4pZjpDlr5yIOVQN3hpce9VPy4=; b=K5xlVj4qeDKo3zixIs6RL1+mlGPHUkZ1oKMChZNCZGtnwgTeBCX8avx5aWrwUmtRuY x1AlLew9AItVuLzgFcakSvPcwMwcFmZMEKJn6NqTchU5/hzCTGogGpUksfO+e0FWE/17 WjWEUKrtgS8skbYEA1nK2B1uwsNI0leQk7dTI=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=Z5MyGrFbG8xuCxSDxObimEz2NpIFBnTEqZOgvA0beO5kmyIk+Tqm43iZGr0vjdyUCi v3YfTleUXflwsUNWsFDWXJc1absn+sP+NcifHAn8vSHKosCrq73pu/WnAXqZiIaTlMEM 2cF4oxTEfFJzvWjxhqjqFY9cxejaEjmRQMTWU=
Il giorno sab, 23/04/2011 alle 19.31 +0200, Francisco Vila ha scritto:
> 2011/4/23 Federico Bruni <fedelogy@xxxxxxxxx>:
> > Hi,
> >
> > please find attached a patch for italian documentation.
> > Thanks for checking and pushing it.
>
> Done, thank you.
Thanks.
I have the same old question about Git. Sorry, I still can't understand
what's happening.
After I made the commit my branch was ahead of origin by 1 commit.
It makes sense, it's ok.
Then you pushed my patch, I pull and I'm now ahead by 2 commits (there
is a merge commit).
What happened?
Why in my local copy my commit is duplicated (the same commit but
different committish)? See:
$ git log
commit 08ac014434e6829cba0c184a31d96f1c9940b543
Merge: 12d6de0 192439e
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sun Apr 24 09:57:06 2011 +0200
Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
into lilypond/translation
commit 192439e23bf243634b52f77dd7b084cac7a8d48c
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sat Apr 23 16:55:09 2011 +0200
Doc-it: add Suggestions chapter of Usage (plus some fixes)
commit 12d6de0415aee9aa42c5e0fafaa94d064db63833
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sat Apr 23 16:55:09 2011 +0200
Doc-it: add Suggestions chapter of Usage (plus some fixes)
commit a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a
Author: Francisco Vila <francisco.vila@xxxxxxxxxxxxx>
I know that I can fix it by reverting to
a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a and pulling again.
But I'd like to first understand what happened.
git diff 12d6de0415aee9aa42c5e0fafaa94d064db63833
192439e23bf243634b52f77dd7b084cac7a8d48c
doesn't show anything, so why these duplicates?
Thanks,
Federico