git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jan 29, 2015, 20:58 UTC
Message-ID
<CAPig+cTvBs3Dq3EWEJ6wYEnMJx5CRLxtDUaLZgExOUT9gtw5_A@mail.gmail.com>
In-Reply-To
<xmqqegqde3ku.fsf_-_@gitster.dls.corp.google.com>
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>
> ---
Previous: Junio C Hamano
Message 7 of 7 in “git loses commits on git pull --rebase with Dictator and Lieutenants Workflow”
  1. DickJan 28, 2015
  2. Chris PackhamJan 29, 2015
  3. Chris PackhamJan 29, 2015
  4. Junio C HamanoJan 29, 2015
  5. DickJan 29, 2015
  6. Re* git loses commits on git pull --rebase with Dictator and Lieutenants WorkflowJunio C Hamano, Jan 29, 2015
  7. Eric SunshineJan 29, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.