all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Richard <youngfrog@members.fsf.org>
To: Juanma Barranquero <lekktu@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>, Emacs developers <emacs-devel@gnu.org>
Subject: Use of git branches (was: [Emacs-diffs] master 2b316c0: ; * CONTRIBUTE: Add section about the bug tracker)
Date: Fri, 06 Nov 2015 11:16:17 +0100	[thread overview]
Message-ID: <87bnb73026.fsf_-_@members.fsf.org> (raw)
In-Reply-To: <CAAeL0SQ6HFBHu+LX_gqzH6OAO1GFmRZZZbjk5VgjVh5v08JeDg@mail.gmail.com> (Juanma Barranquero's message of "Fri, 6 Nov 2015 10:56:32 +0100")

Juanma Barranquero <lekktu@gmail.com> writes:
> On Fri, Nov 6, 2015 at 10:49 AM, Eli Zaretskii <eliz@gnu.org> wrote:
>> The convention was to use scratch/ for experimental branches and fix/
>> for public feature branches that fix some issue. Suggestions to
>> codify this are welcome.
>
> Was this convention discussed on emacs-devel?

ISTR there was some kind of decision that scratch/ branches didn't have
to follow the gitlog-is-ChangeLog convention, i.e. they would never be
merged as is, but always rebased or squashed onto master.

-- 
Nico



  parent reply	other threads:[~2015-11-06 10:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20151106085750.28172.54745@vcs.savannah.gnu.org>
     [not found] ` <E1ZucqE-0007L0-MZ@vcs.savannah.gnu.org>
2015-11-06  9:33   ` [Emacs-diffs] master 2b316c0: ; * CONTRIBUTE: Add section about the bug tracker Juanma Barranquero
2015-11-06  9:49     ` Eli Zaretskii
2015-11-06  9:56       ` Juanma Barranquero
2015-11-06 10:10         ` Eli Zaretskii
2015-11-06 10:18           ` Juanma Barranquero
2015-11-06 10:44             ` Eli Zaretskii
2015-11-06 13:59               ` Juanma Barranquero
2015-11-06 14:27                 ` Eli Zaretskii
2015-11-06 10:16         ` Nicolas Richard [this message]
2015-11-06 10:46           ` Use of git branches (was: [Emacs-diffs] master 2b316c0: ; * CONTRIBUTE: Add section about the bug tracker) Eli Zaretskii
2015-11-06 13:54             ` Juanma Barranquero
2015-11-06 14:56               ` Use of git branches David Kastrup
2015-11-07  1:57                 ` Juanma Barranquero
2015-11-07  8:18                   ` David Kastrup
2015-11-07  9:45                     ` Juanma Barranquero
2015-11-06 16:05               ` John Wiegley
2015-11-07  2:02                 ` Juanma Barranquero

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=87bnb73026.fsf_-_@members.fsf.org \
    --to=youngfrog@members.fsf.org \
    --cc=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=lekktu@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. 
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.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.