Re: help with git

2011-07-22 Thread Julien Valroff
Le jeudi 21 juil. 2011 à 19:39:00 (+0200 CEST), Simon McVittie a écrit : > On Thu, 21 Jul 2011 at 19:16:50 +0200, Julien Valroff wrote: > > When running this type of config, how do you avoid pushing the upstream > > tags to the debian repository? > > To push individual tags, use "git push origin 1

Re: help with git

2011-07-21 Thread Norbert Preining
Hi, thanks for your help, Jonas, I think I found the error, or better, a way to fix that. On Do, 21 Jul 2011, Jonas Smedegaard wrote: > ...perhaps because you mess with config file options that you are not > familiar with. Well, I used only git for editing the config file, by calling git remote

Re: help with git

2011-07-21 Thread Simon McVittie
On Thu, 21 Jul 2011 at 19:16:50 +0200, Julien Valroff wrote: > When running this type of config, how do you avoid pushing the upstream > tags to the debian repository? To push individual tags, use "git push origin 1.2-3" or something, instead of "git push --tags". To get rid of the upstream tags

Re: help with git

2011-07-21 Thread Julien Valroff
Le jeudi 21 juil. 2011 à 15:57:32 (+0200 CEST), Thomas Preud'homme a écrit : > Le jeudi 21 juillet 2011 10:11:37, Jonas Smedegaard a écrit : > > On 11-07-21 at 11:10am, Norbert Preining wrote: > > > I now want to include upstream git into a branch, either the upstream > > > branch itself, or some o

Re: help with git

2011-07-21 Thread Jonas Smedegaard
On 11-07-21 at 11:18pm, Norbert Preining wrote: > On Do, 21 Jul 2011, Jonas Smedegaard wrote: > > > > git checkout -B --track upstream-git/foo bar > > > > > > That gives me: > > > fatal: git checkout: updating paths is incompatible with switching > > > branches. > > > > Sorry, as often happe

Re: help with git

2011-07-21 Thread Norbert Preining
On Do, 21 Jul 2011, Jonas Smedegaard wrote: > > > git checkout -B --track upstream-git/foo bar > > > > That gives me: > > fatal: git checkout: updating paths is incompatible with switching > > branches. > > Sorry, as often happens I got the order wrong: > > git checkout -B --track bar u

Re: help with git

2011-07-21 Thread Jonas Smedegaard
On 11-07-21 at 11:06pm, Norbert Preining wrote: > On Do, 21 Jul 2011, Jonas Smedegaard wrote: > > I would, instead of editing the config, use this command: > > > > git checkout -B --track upstream-git/foo bar > > That gives me: > fatal: git checkout: updating paths is incompatible with sw

Re: help with git

2011-07-21 Thread Norbert Preining
On Do, 21 Jul 2011, Thomas Preud'homme wrote: > I would also precede it with git remote add upstream-git > That I did already. Thanks both for your suggestions, unfortunately I am not further by now. Any other ideas? Best wishes Norbert ---

Re: help with git

2011-07-21 Thread Norbert Preining
On Do, 21 Jul 2011, Jonas Smedegaard wrote: > I would, instead of editing the config, use this command: > > git checkout -B --track upstream-git/foo bar That gives me: fatal: git checkout: updating paths is incompatible with switching branches. Best wishes Norbert ---

Re: help with git

2011-07-21 Thread Thomas Preud'homme
Le jeudi 21 juillet 2011 10:11:37, Jonas Smedegaard a écrit : > On 11-07-21 at 11:10am, Norbert Preining wrote: > > I now want to include upstream git into a branch, either the upstream > > branch itself, or some other/new one, but I have no idea how > > to set that up? > > > > Can someone help me

Re: help with git

2011-07-21 Thread Jonas Smedegaard
On 11-07-21 at 11:10am, Norbert Preining wrote: > I now want to include upstream git into a branch, either the upstream > branch itself, or some other/new one, but I have no idea how > to set that up? > > Can someone help me here? The remote is some > git://gitorious.org//.git > > By now I