This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin/refs/meta/config] Allow merge commits on master.
- From: Joel Brobecker <brobecke at sourceware dot org>
- To: cygwin-cvs at sourceware dot org, newlib-cvs at sourceware dot org
- Date: 29 May 2015 12:16:52 -0000
- Subject: [newlib-cygwin/refs/meta/config] Allow merge commits on master.
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