| 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: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 11:12:53 +0100
- Cc: Federico Bruni <fedelogy@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:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=ufa/WvL51MRqkfVLY97uUB77UEkxw2IDzFOJLDAD5eE=; b=ok0IgnqQXKWLY08/8hG5wxL7bu15ZNI43Y2gFrQ8CLTzfcGLe5vfwVAUt94KGaoIPB SHzPkOZMmjzD//AoEMOlF2qMgCF4m2eDSl+FvVYGgv0Vk/Qr60WspzNIRSo2zT/lZrU5 oP8+ly58+AI4IKUdTQ51tR1ODIdoSW/41eTzI=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=BVBechCPzgoT1YsGxY/M2nTQMX3vN9D8wmjG47NP4X8EpiT2il7JL8kWEMltNaG2XI owTrWg3n8eRkB8cjzHI+Qr3swFe9iah8+X5w4hExeuMVnQGA3NldZOHir3cqlx+Ow1Q/ 4sUy4+0IpWaHNqctx3mGSyl53lV2XUhePSzVk=
2010/11/22 John Mandereau <john.mandereau@xxxxxxxxx>:
> 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.
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.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com