Re: Re* git loses commits on git pull --rebase with Dictator and Lieutenants Workflow
On Thu, Jan 29, 2015 at 3:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> 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. your publishing point). That will never
> work satisfactory. Think about what refs/remotes/origin/* would
s/satisfactory/satisfactorily/
Show 17 quoted lines
> mean in such a world---it fundamentally cannot reflect the reality.
> If it follows the state of your upstream, it cannot match what you
> have published, and vice versa.
>
> Some low-quality websites may be spreading misinformation. Let's
> counter them by adding a few words to our documentation.
>
> - The description was referring to <oldurl> and <newurl>, but never
> mentioned <name> argument you give from the command line. By
> mentioning "remote <name>", stress the fact that it is configuring
> a single remote.
>
> - Add a reminder that explicitly states that this is about a single
> remote, which the triangular workflow is not about.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---