| Re: [translations] Web-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Federico Bruni <fedelogy@xxxxxxxxx>
- Subject: Re: [translations] Web-it update patch
- From: John Mandereau <john.mandereau@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 10:55:00 +0100
- Cc: 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; bh=kFZ8V2/pOqqZ7c+R2zEJ5L8HKidF6AALiRr0HauoACY=; b=w88SJ+MgrZBfm1mVh0dOUTd7ISyGMup85HV558Py2uTxTk+mJ00qihry6THqVGFUAH n7viAD0X9PWPPjnvrGiG/U+nrmCFq/Jvz3cMXIxT8hNA+765VS/yOPTxW+krLcPFJSqO lSrbBp9eXajmy1mTry/B9X5I4sqMzWZERS1/k=
- 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; b=DNw3K2J8Q2y0i2s6FsZ/AedUJphsfQ4Smel8fG+BSfjCdJPcjyRj2qg4upDkbPATGx PIzaknrd4bFFOHh5ETMUnVwOA9n3R6SDDtY13zjQI9r0YbCyUCWkWNOxsYbq1yErusYV EgN0bhEv1g5PEg2ZdtC6gds8C/3K8CYM/ryjI=
Il giorno lun, 22/11/2010 alle 08.47 +0100, Federico Bruni ha scritto:
> Last question: I tried to pull and saw the conflict in
> it/web/community.itexi.
> I've fixed my file, then 'git add file' and 'git commit -a'.
> It seems fine, but this output is OK?
>
> fede@debian:~/lilypond-git$ git status
> # On branch lilypond/translation
> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
> #
> nothing to commit (working directory clean)
>
> My branch is ahead of origin by 2 commits... What does it mean?
> Is it normal?
Could you send the output of first three commits from "git log -p"? This
will give more precise information than what Francisco requested.
Attachment:
signature.asc
Description: This is a digitally signed message part