From: "\( via Guix-patches" via <guix-patches@gnu.org>
To: 59523@debbugs.gnu.org
Cc: "\(" <paren@disroot.org>
Subject: [bug#59523] [PATCH v2 3/3] doc: contributing: Recommend --base=origin/master.
Date: Sat, 26 Nov 2022 11:54:26 +0000 [thread overview]
Message-ID: <20221126115426.7385-3-paren@disroot.org> (raw)
In-Reply-To: <20221126115426.7385-1-paren@disroot.org>
* doc/contributing.texi ("Submitting Patches")
["Sending a Patch Series"]: Recommend --base=origin/master instead
of --base=auto.
---
doc/contributing.texi | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/doc/contributing.texi b/doc/contributing.texi
index d2c1d69f69..edbdf2fded 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -1428,7 +1428,8 @@ open it in your @var{EDITOR} or @var{VISUAL} for editing, and send it to
the Guix mailing list to be reviewed and merged:
@example
-$ git send-email -1 -a --base=auto --to=guix-patches@@gnu.org
+$ git send-email -1 -a --base=origin/master \
+ --to=guix-patches@@gnu.org
@end example
@quotation Tip
@@ -1439,7 +1440,7 @@ other than the @code{master} branch of
@url{https://git.savannah.gnu.org/cgit/guix.git}.
@example
-git send-email -1 -a --base=auto \
+git send-email -1 -a --base=origin/master \
--subject-prefix='PATCH core-updates' \
--to=guix-patches@@gnu.org
@end example
@@ -1450,9 +1451,11 @@ message. You may ``annotate'' the patch with explanatory text by adding
it under this line. If you do not wish to annotate the email, you may
drop the @option{-a} flag (which is short for @option{--annotate}).
-The @option{--base=auto} flag automatically adds a note at the bottom
-of the patch of the commit it was based on, making it easier for
-maintainers to rebase and merge your patch.
+The @option{--base=origin/master} flag automatically adds a note at the
+bottom of the patch of the commit hash of @code{origin/master}, making it
+easier for maintainers to rebase and merge your patch. Of course, if
+your patchset is based on, say, @code{core-updates}, you need to use
+@option{--base=origin/core-updates}.
If you need to send a revised patch, don't resend it like this or send
a ``fix'' patch to be applied on top of the last one; instead, use
@@ -1462,7 +1465,7 @@ address and the @option{-v} flag with @command{git send-email}.
@example
$ git commit -a
-$ git send-email -1 -a --base=auto -v@var{REVISION} \
+$ git send-email -1 -a --base=origin/master -v@var{REVISION} \
--to=@var{ISSUE_NUMBER}@@debbugs.gnu.org
@end example
@@ -1506,7 +1509,7 @@ with @command{git format-patch}.
@example
$ git format-patch -@var{NUMBER_COMMITS} -o outgoing \
- --cover-letter --base=auto
+ --cover-letter --base=origin/master
@end example
We can now send @emph{just} the cover letter to the
@@ -1540,7 +1543,7 @@ the patchset.
@example
$ git send-email -@var{NUMBER_COMMITS} \
- -v@var{REVISION} --base=auto \
+ -v@var{REVISION} --base=origin/master \
--to @var{ISSUE_NUMBER}@@debbugs.gnu.org
@end example
--
2.38.1
next prev parent reply other threads:[~2022-11-26 11:55 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 19:07 [bug#59523] [PATCH] doc: contributing: Note '-v REVISION' bug in 'git send-email' ( via Guix-patches via
2022-11-23 19:30 ` Tobias Geerinckx-Rice via Guix-patches via
2022-11-23 22:31 ` ( via Guix-patches via
2022-11-24 2:04 ` Kyle Meyer
2023-03-13 23:43 ` Kyle Meyer
2023-03-21 12:34 ` Maxim Cournoyer
2022-11-23 20:47 ` zimoun
2022-11-26 11:54 ` [bug#59523] [PATCH v2 1/3] " ( via Guix-patches via
2022-11-26 11:54 ` [bug#59523] [PATCH v2 2/3] doc: contributing: Fix incorrect guix-patches address ( via Guix-patches via
2022-11-26 11:54 ` ( via Guix-patches via [this message]
2023-01-11 10:58 ` [bug#59523] [PATCH v2 3/3] doc: contributing: Recommend --base=origin/master Christopher Baines
2023-01-11 17:05 ` ( via Guix-patches via
2022-12-02 16:09 ` [bug#59523] [PATCH v2 1/3] doc: contributing: Note '-v REVISION' bug in 'git send-email' zimoun
2023-01-11 10:57 ` Christopher Baines
2023-03-21 12:41 ` bug#59523: [PATCH] " Maxim Cournoyer
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=20221126115426.7385-3-paren@disroot.org \
--to=guix-patches@gnu.org \
--cc=59523@debbugs.gnu.org \
--cc=paren@disroot.org \
/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.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.