Commit Diff


commit - 8188995465e290f0c40e274e16943e8626e6527c
commit + 6ef7de4c9b01d9c6fac92afab8f824ba98f096a8
blob - b440cc663d17ef045b299bde7b5df57d339c7fe1
blob + 2d2ec5603866576e4472b31cfa642bcc47fd7495
--- notes-pull-push
+++ notes-pull-push
@@ -13,8 +13,9 @@ with merge strategy set to 'rebase-if-necessary', but 
 review UI and without Java.
 
 gotd(8) would also regulate read/write access to branches and perform
-various sanity checks on commits (require a log message, reject merge
-commits, ...)
+various sanity checks on commits: require a log message, reject merge
+commits except where necessary (e.g. merges of vendor branches), ...
+
 Another responsibility of gotd(8) would be to keep repo mirrors in sync.
 
 ---