| Re: [translations] Doc-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Francisco Vila <paconet.org@xxxxxxxxx>
- Subject: Re: [translations] Doc-it update patch
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Sat, 04 Dec 2010 10:52:46 +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:content-transfer-encoding; bh=ckIYWPxUIZ1PQYtujvDTQyfGJKYokKazquziFPEILgQ=; b=BkWFeUzFIWvZEtPvNFb3E2hjImCqhbCm2ebJpaHi6BWA/+HXQ5pMhVv6z4gTkBznvR mwxRa6ggBKAH0qkj3Kl3gPwMveRR8miLpVPZpTN0Ql9WTw7nNjVTcjRdfSiDf25LaJtg Xw6h8EwSvy83U0hVXbP7Sw0PnVwxgVL2d95e0=
- 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=fqcqbFBj3MovCewUyc9VkmurZkfokxz2is/KX/tI8Hcb4DwhIu2XUbik/KpAi8BtAh RTcUQM5PrsXAq8Sd04fomY/drMf4tvwy4phYR08d2MjixLVXtSAiV/FnEoOvNYpP+BNh WvJMDGqlPbwwiqHPDDzXaFK/Xg1I8qu2nqEug=
Il giorno ven, 03/12/2010 alle 23.56 +0100, Francisco Vila ha scritto:
> > Hi Francisco,
> >
> > a gentle ping to remind you...
>
> Done. Please check! Thank you
Thanks.
There is no conflict but, after pulling, my branch is ahead by 2 commit.
git log -p
commit 2e2166004fdd1cbfd3cda09ec697bbe84d73a001
Merge: 6f6134b 27945b3
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sat Dec 4 10:24:18 2010 +0100
Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
into li
commit 27945b310409e8e0e76ceffc5aa34851448239b8
Author: Federico Bruni <fedelogy@xxxxxxxxx>
Date: Sat Nov 27 17:22:41 2010 +0100
Doc-it: update italian translation
So the last commit is the merge.
I'm sure there's no difference between my copy and origin.
So I could safely do:
git reset --hard origin/lilypond/translation
right?
But I wonder: why git pull didn't "work"?
I should have pushed before pulling?
I guess that always using git reset --hard is not a "best practice".
See below for git output.
fede@debian:~/lilypond-git$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 1 commit.
#
nothing to commit (working directory clean)
fede@debian:~/lilypond-git$
fede@debian:~/lilypond-git$
fede@debian:~/lilypond-git$ git pull
remote: Counting objects: 1242, done.
remote: Compressing objects: 100% (344/344), done.
remote: Total 899 (delta 666), reused 753 (delta 555)
Receiving objects: 100% (899/899), 1.12 MiB | 220 KiB/s, done.
Resolving deltas: 100% (666/666), completed with 337 local objects.