public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/refs/meta/config] Allow merge commits on master.
@ 2015-05-29 12:16 Joel Brobecker
  0 siblings, 0 replies; only message in thread
From: Joel Brobecker @ 2015-05-29 12:16 UTC (permalink / raw)
  To: cygwin-cvs, newlib-cvs

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


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2015-05-29 12:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-05-29 12:16 [newlib-cygwin/refs/meta/config] Allow merge commits on master Joel Brobecker

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).