public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Joel Brobecker <brobecke@sourceware.org>
To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org
Subject: [newlib-cygwin/refs/meta/config] Allow merge commits on master.
Date: Fri, 29 May 2015 12:16:00 -0000	[thread overview]
Message-ID: <20150529121652.91467.qmail@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8e1d67017068e348ee80942b851b32b765499d91

commit 8e1d67017068e348ee80942b851b32b765499d91
Author: Joel Brobecker <brobecker@adacore.com>
Date:   Fri May 29 05:16:13 2015 -0700

    Allow merge commits on master.

Diff:
---
 project.config | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/project.config b/project.config
index 8fced75..805efa5 100644
--- a/project.config
+++ b/project.config
@@ -7,11 +7,6 @@
         # debugging session, error messages, logs, etc.
         max-rh-line-length = 0
 
-        # Reject merge commits on master: We request that people rebase
-        # their changes #    before pushing instead (merge commits tend
-        # to confuse git newcommers).
-        reject-merge-commits = refs/heads/master
-
         # The style checker, applied to the contents of each file being
         # modified.
         style-checker = /git/newlib-cygwin.git/hooks-bin/style_checker


                 reply	other threads:[~2015-05-29 12:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20150529121652.91467.qmail@sourceware.org \
    --to=brobecke@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    --cc=newlib-cvs@sourceware.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. 
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 read-only IMAP folder(s) and NNTP newsgroup(s).