From: Junio C Hamano <gitster@pobox•com>
To: Philip Oakley <philipoakley@iee•org>
Cc: GitList <git@vger•kernel.org>, Jonathan Nieder <jrnieder@gmail•com>
Subject: Re: [PATCH v2 1/1] doc: format-patch: don't use origin as a branch name
Date: Mon, 04 Aug 2014 11:23:39 -0700 [thread overview]
Message-ID: <xmqqfvhcru50.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqq38dctcmz.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 04 Aug 2014 09:58:44 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> 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".
> 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".
next prev parent reply other threads:[~2014-08-04 18:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-02 15:46 [PATCH v2 0/1] doc: format-patch Philip Oakley
2014-08-02 15:46 ` [PATCH v2 1/1] doc: format-patch: don't use origin as a branch name Philip Oakley
2014-08-04 16:58 ` Junio C Hamano
2014-08-04 18:23 ` Junio C Hamano [this message]
2014-08-04 21:51 ` Philip Oakley
2014-08-04 22:12 ` Junio C Hamano
2014-08-04 23:19 ` Philip Oakley
2014-08-05 18:19 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2014-08-14 19:50 Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfvhcru50.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=philipoakley@iee$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox