This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin(refs/meta/config)] Revert "Allow merge commits on master."
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org, newlib-cvs at sourceware dot org
- Date: 29 May 2015 15:08:24 -0000
- Subject: [newlib-cygwin(refs/meta/config)] Revert "Allow merge commits on master."
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=37b4b8fa5e1385e507726857d4b2a1c39189332f
commit 37b4b8fa5e1385e507726857d4b2a1c39189332f
Author: Corinna Vinschen <vinschen@redhat.com>
Date: Fri May 29 17:07:48 2015 +0200
Revert "Allow merge commits on master."
This reverts commit 8e1d67017068e348ee80942b851b32b765499d91,
only required temporarily.
Diff:
---
project.config | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/project.config b/project.config
index 805efa5..8fced75 100644
--- a/project.config
+++ b/project.config
@@ -7,6 +7,11 @@
# 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