summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Gomez <[email protected]>2017-11-09 16:58:23 +0200
committerAndres Gomez <[email protected]>2017-11-10 19:36:24 +0200
commitb8c85f5accad78d62476a02f0dc5eb64953998d7 (patch)
treeb406f8146d4a3df86478eb559cdbfd2a9550a6dc
parent3bc16339e5855bffe07905f83f8670930b0e8430 (diff)
docs/releasing: improve the pre-announce template and examples
v2: Choose a proper rejection example (Emil). Cc: Emil Velikov <[email protected]> Cc: Eric Engestrom <[email protected]> Signed-off-by: Andres Gomez <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]>
-rw-r--r--docs/releasing.html14
1 files changed, 11 insertions, 3 deletions
diff --git a/docs/releasing.html b/docs/releasing.html
index 944b6e88bc1..c7f5dfe5d2b 100644
--- a/docs/releasing.html
+++ b/docs/releasing.html
@@ -374,6 +374,9 @@ Queued (NUMBER)
AUTHOR (NUMBER):
COMMIT SUMMARY
+[If applicable:
+Squashed with
+ COMMIT SUMMARY]
For example:
@@ -382,16 +385,21 @@ Jonas Pfeil (1):
Squashed with
ralloc: don't leave out the alignment factor
+
Rejected (NUMBER)
=================
-Rejected (11)
-=============
-
AUTHOR (NUMBER):
SHA COMMIT SUMMARY
Reason: ...
+
+For example:
+
+Emil Velikov (1)
+ a39ad18 configure.ac: honour LLVM_LIBDIR when linking against LLVM
+
+Reason: The patch was reverted shortly after it was merged.
</pre>