| Re: [translations] Web-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: John Mandereau <john.mandereau@xxxxxxxxx>
- Subject: Re: [translations] Web-it update patch
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 19:49:42 +0100
- Cc: Francisco Vila <paconet.org@xxxxxxxxx>, Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=Uxram+jqTtv4Z+oSXrsI+7Q18QfBJgmMAqSvY8G/d+0=; b=aXTnxdbCR7eBEuGAlnbLsjy+Hr/o2VpIzDIYSRUozuSwBW/VFUfCCFChyP+TGPlZVJ gJLDkWhQZrJQT7Gw/HCDI3FIb0AZG5o2rppU9o/KZHVA+wVJGFhChygg76hgMf0TAa0L Z5tv53C3ls4Zq2rfg8UWBgj6TfqKfTqLh2p+E=
- 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=ErUG9LAV9n69y4aO9zUfFkTxY601fGwa6EWEhf6dg80WdimmKCvVvSCXh5dkYenxbJ UADPVrgP6OF3nFcenDu1dZk9etUXQ8HR+7TMLGpJS3xYzLUecDDIPrBoCbuvtECdz9zD OX4S8wbVG43lRuuH6Qm5jXbEMdwy8BNJrE8To=
Il giorno lun, 22/11/2010 alle 15.25 +0100, John Mandereau ha scritto:
> Il giorno lun, 22/11/2010 alle 11.12 +0100, Francisco Vila ha scritto:
> > True and not true. 'git log -p' gives a detailed log in patch form,
> > but IMO (if an opinion is possible here at all) 'git diff origin'
> > shows how your branch differs from origin, which 'git log' doesn't. I
> > could be wrong, but Federico asked about the fact that his branch was
> > ahead of origin by two commits.
>
> Oops, my bad. I guess one of these two commits is the merge commit, the
> other one the commit that originated the patch he sent, and the three
> last commits given by "git log -p" might not include the former, in case
> it displays those from origin/lilypond/translation first, so you were
> right to ask diff output. Federico, could you send both outputs that
> Francisco and I requested, please?
>
git diff origin/lilypond/translation gives no output
three last commits given by 'git log -p':
commit 9fd0d13c081d482922dbc5eb4747cde6bd965ea7
Merge: 4ad45c8 92190ad
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Mon Nov 22 08:38:14 2010 +0100
Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
into li
Conflicts:
Documentation/it/web/community.itexi
commit 92190ad98deac78cf32837078741296205072119
Author: John Mandereau <john.mandereau@xxxxxxxxx>
Date: Sun Nov 21 22:48:49 2010 +0100
Docs-de: update syntax with convert-ly to fix doc build
commit 69068a797fa36f51f487c62754729a82d5e8bb99
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sun Nov 21 20:28:41 2010 +0100
Web-it: update italian translation of website