Re: Re* git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Eric Sunshine
On Thu, Jan 29, 2015 at 3:26 PM, Junio C Hamano wrote: > Subject: Documentation/git-remote.txt: stress that set-url is not for > triangular > > It seems to be a common mistake to try using a single remote > (e.g. 'origin') to fetch from one place (i.e. upstream) while > pushing to another (i.e. y

Re* git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Junio C Hamano
Dick writes: > I guess the git remote set-url --push command should contain some warning > about this. Perhaps something like this would be good enough for a starter. -- >8 -- Subject: Documentation/git-remote.txt: stress that set-url is not for triangular It seems to be a common mistake to t

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Dick
Thanks Junio! I should use git config remote.pushDefault thanks for pointing me in the right direction. I guess the git remote set-url --push command should contain some warning about this. gr Dick -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to ma

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Junio C Hamano
Dick writes: > rm -rf left/ right/ right.git/ > git init left > cd left/ > echo "hello world" > test.txt > git add test.txt > git commit -m . > cd .. > git clone --bare left right.git > git clone right.git/ right > cd right > git remote set-url origin ../left > git remote set-url origin --push .

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Chris Packham
On Fri, Jan 30, 2015 at 6:27 AM, Chris Packham wrote: > Hi, > > On Thu, Jan 29, 2015 at 8:49 AM, Dick wrote: >> Hi all, >> >> I've encountered a problem with the Dictator and Lieutenants Workflow. I've >> configured remote origin so it pulls from the "blessed repository" and >> pushes to the "dev

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Chris Packham
Hi, On Thu, Jan 29, 2015 at 8:49 AM, Dick wrote: > Hi all, > > I've encountered a problem with the Dictator and Lieutenants Workflow. I've > configured remote origin so it pulls from the "blessed repository" and > pushes to the "developer public" repository. > > When the "blessed repository" has

git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-28 Thread Dick
Hi all, I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the "blessed repository" and pushes to the "developer public" repository. When the "blessed repository" has the same branch name as the "developer public" repository gi