| 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: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Mon, 22 Nov 2010 10:11:05 +0100
- Cc: John Mandereau <john.mandereau@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=PlFfXPxNvqzXphmNSyJL8S19+v/ujSeBHQA7Qh5uUIU=; b=seUUXnFHz7/jmbfDX1SlF0Fju+WxxXfn6gqJUFrEYcrPsOOY/9e3mOXFnHGUeinHyE f0j2i5uPNV+6pgRhZIMjED53QEhxIgwvCTq5q48yD6gTZJMWbhNtgq97McZADm645auu 3IsfDoKr/u9dBpXbBuVb/2VCwKk+p5l/INXOI=
- 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=QpJQ8okLNS7NJvMpsh6xCqAkdOUIbD4WzT0RTbx5EQLwrchccrhCaL5TQB3cdZ8HGO rT/VYub39J40MyItW/ykR7jh++7tOqqH605krEQV8Yfy5+ffC/CMKrMI9NTIEkQr7+zY wMZ1kK3wtqX4kB7YyE9tGVhWbZOfKvklWPXlE=
2010/11/22 Federico Bruni <fedelogy@xxxxxxxxx>:
> 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?
What's your output from
git diff origin/lilypond/translation
?
You didn't push your commits yet, probably that's why your branch is ahead
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com