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

Re: [PATCH v2 1/1] doc: format-patch: don't use origin as a branch name

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 4, 2014, 18:23 UTC
Message-ID
<xmqqfvhcru50.fsf@gitster.dls.corp.google.com>
In-Reply-To
<xmqq38dctcmz.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> Compared to that, what the user's local 'master' has is much less
> relevant.  For one thing, if a more recent commit that is on the
> remote repository is missing on 'origin/master' because you haven't
> fetched recently, by definition that commit will not be on your
> 'master' either, so you have the same staleness issue to the exact
> degree.  Even worse, when you are developing a topic to upstream, it

clarification. I used "to upstream" as a verb to mean "sending the work you did to be applied".

Show 6 quoted lines
> is a good practice to merge your topic to your own 'master' to check
> it with the wider project codebase that is more recent than where
> your topic earlier forked from, and it makes little sense to tell
> 'exclude what I have on my master' to format-patch when extracting
> changes to upstream out of such a topic.  You send what the other
> side has, not what you do not have on your local 'master' branch.

and I have a stupid typo here; obviously I should have typed: You send what the other side "does not have".

Previous: Junio C HamanoNext: Philip Oakley
Message 4 of 8 in “doc: format-patch”
  1. 0/1 doc: format-patchPhilip Oakley, Aug 2, 2014
  2. 1/1 doc: format-patch: don't use origin as a branch namePhilip Oakley, Aug 2, 2014
  3. Junio C HamanoAug 4, 2014
  4. Junio C HamanoAug 4, 2014
  5. Philip OakleyAug 4, 2014
  6. Junio C HamanoAug 4, 2014
  7. Philip OakleyAug 4, 2014
  8. Junio C HamanoAug 5, 2014

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.