From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 1/1] doc: format-patch: don't use origin as a branch name
Date: Sat, 2 Aug 2014 16:46:23 +0100 [thread overview]
Message-ID: <1406994383-5076-2-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1406994383-5076-1-git-send-email-philipoakley@iee.org>
Historically (5 Nov 2005 v0.99.9-46-g28ffb89) the git-format-patch used
'origin' as the upstream branch name. That name is now used as the nominal
name for the upstream remote.
While 'origin' would be DWIMmed (do what I mean) to be that remote's
primary branch, do not assume the reader is ready for such magic.
Likewise, do not use 'origin/master' which may not be up to date with the
remote, nor reflect the reader's master branch. The patch series should be
relative to the reader's view of 'git show-branch HEAD master'.
Use the more modern 'master' as the reference branch name.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
Documentation/git-format-patch.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c0fd470..b0f041f 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -523,25 +523,25 @@ $ git format-patch -k --stdout R1..R2 | git am -3 -k
------------
* Extract all commits which are in the current branch but not in the
-origin branch:
+master branch:
+
------------
-$ git format-patch origin
+$ git format-patch master
------------
+
For each commit a separate file is created in the current directory.
-* Extract all commits that lead to 'origin' since the inception of the
+* Extract all commits that lead to 'master' since the inception of the
project:
+
------------
-$ git format-patch --root origin
+$ git format-patch --root master
------------
* The same as the previous one:
+
------------
-$ git format-patch -M -B origin
+$ git format-patch -M -B master
------------
+
Additionally, it detects and handles renames and complete rewrites
--
1.9.4.msysgit.0
next prev parent reply other threads:[~2014-08-02 15:46 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 ` Philip Oakley [this message]
2014-08-04 16:58 ` [PATCH v2 1/1] doc: format-patch: don't use origin as a branch name Junio C Hamano
2014-08-04 18:23 ` Junio C Hamano
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=1406994383-5076-2-git-send-email-philipoakley@iee.org \
--to=philipoakley@iee.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).