Re: Question about git

2009-05-08 Thread Filippo Argiolas
On Thu, May 7, 2009 at 2:23 AM, Behdad Esfahbod beh...@behdad.org wrote: On 05/06/2009 07:00 AM, Simos Xenitellis wrote: On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbodbeh...@behdad.org  wrote: On 05/05/2009 01:28 AM, Shaun McCance wrote: This assumes that the branch is merged into master

Re: Question about git

2009-05-08 Thread Simos Xenitellis
On Fri, May 8, 2009 at 7:30 AM, Filippo Argiolas fargio...@gnome.org wrote: On Thu, May 7, 2009 at 2:23 AM, Behdad Esfahbod beh...@behdad.org wrote: On 05/06/2009 07:00 AM, Simos Xenitellis wrote: On Tue, May 5, 2009 at 4:41 PM, Behdad Esfahbodbeh...@behdad.org  wrote: On 05/05/2009 01:28

Re: problem with git

2009-05-08 Thread Tirumurti Vasudevan
sir my problems persist. i tried with a new file. going by the book. well almost... fails to get pushed. - d...@narayana:~/git$ cd gnome-applets/ d...@narayana:~/git/gnome-applets$ git pull --rebase po/ta.po: needs update refusing to pull with rebase: your working tree is

Re: problem with git

2009-05-08 Thread Simos Xenitellis
On Fri, May 8, 2009 at 1:07 PM, Tirumurti Vasudevan agnih...@gmail.com wrote: d...@narayana:~$ cd git/brasero/ d...@narayana:~/git/brasero$ git reset --hard HEAD is now at 632f269 Updated Tamil translation d...@narayana:~/git/brasero$ git clean -n Would remove po/brasero.pot

Re: Question about git

2009-05-08 Thread Filippo Argiolas
On Fri, May 8, 2009 at 1:39 PM, Simos Xenitellis simos.li...@googlemail.com wrote: OK, I have updated the instructions at http://live.gnome.org/TranslationProject/GitHowTo#head-0a9ee3ff743fcd06eb70ab98c93780c48d724a1f Thank you, it's fine for me now :) Filippo