On Sun, 5 Jul 2009 11:31:00 -0300, Caco Patane <cacopatane at gmail.com> wrote: > Hi Zero3, > >> A) Please remember to use the "--rebase" argument when pulling from >> wininstaller-staging. This will prevent non-linear history / bad commits >> like this one: >> >> "cacopatane (author) June 18, 2009: Merge branch 'master' of >> git://github.com/freenet/wininstaller-staging" > > I saw that, but no idea how to solve it. In witch stage of the cicle I > must call "--rebase" to prevent this commits? Can you show me a small > example?
I'm a git n00b myself, but I've been using "git pull --rebase" when pulling with success. If you only use "git pull", you will cause the merge thing to happen. So simply appending "--rebase" to the pull command should work. >> B) Do you have any contact details I can add to the header of your >> translation? It would be nice in case I need to contact you about >> updates or the like. (Unless you don't want to finish it as either?) > > Yes, my e-mail address is this. When I'm on IRC you can find me on > #freenet or #freenet-es. Contact me for futher updates or > modifications. Before commiting I was testing the instaler building it > on a windows machine in order to check that no GUI uglyness were made > by the new translations. Cool. I'll add your address. Your translation indeed fits the GUI very well :). You do realize that you have a bunch of untranslated lines in your translation though? - Zero3
