mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Robert Schwebel <r.schwebel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] Documentation: clarify that patches should target the master branch.
Date: Mon, 26 Sep 2016 08:06:47 +0200	[thread overview]
Message-ID: <20160926060647.5dhgvzg6fgmrhwmr@pengutronix.de> (raw)
In-Reply-To: <1474564462-8419-1-git-send-email-r.schwebel@pengutronix.de>

On Thu, Sep 22, 2016 at 07:14:22PM +0200, Robert Schwebel wrote:
> I asked Sascha if he still prefers patches against 'next', and it turned
> out that this is not true any more and patches should be sent against
> master.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  Documentation/user/barebox.rst | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/Documentation/user/barebox.rst b/Documentation/user/barebox.rst
> index 32cec3d..1203c10 100644
> --- a/Documentation/user/barebox.rst
> +++ b/Documentation/user/barebox.rst
> @@ -28,9 +28,11 @@ can be checked out as follows:
>    Checking connectivity... done.
>    Checking out files: 100% (5651/5651), done.
>  
> -After this, make sure to check out the appropriate branch. If you want to
> -develop for barebox, it's best to check out the ``next`` branch rather than
> -the ``master`` branch:
> +By default, the master branch is checked out. If you want to develop for
> +barebox, this is the right branch to send patches against.
> +
> +If you want to see which patches are already selected for the next release,
> +you can look at the ``next`` branch:
>  
>  .. code-block:: sh
>  
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2016-09-26  6:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-22 17:14 Robert Schwebel
2016-09-26  6:06 ` Sascha Hauer [this message]

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=20160926060647.5dhgvzg6fgmrhwmr@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=r.schwebel@pengutronix.de \
    /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