<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Tanu Kaskinen pushed to branch master
at <a href="https://gitlab.freedesktop.org/pulseaudio/paprefs">PulseAudio / paprefs</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.freedesktop.org/pulseaudio/paprefs/-/commit/78e0d7bd7d8b89e7974b7d54bcf25edb31a0c5cb">78e0d7bd</a></strong>
<div>
<span>by Tanu Kaskinen</span>
<i>at 2021-12-22T13:32:04+02:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">README: Add a news item for the 1.2 release
</pre>
</li>
<li>
<strong><a href="https://gitlab.freedesktop.org/pulseaudio/paprefs/-/commit/d70f061e1703c53aa327d3e836222e47dde86204">d70f061e</a></strong>
<div>
<span>by Tanu Kaskinen</span>
<i>at 2021-12-22T13:32:08+02:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Prepare for releasing 1.2
</pre>
</li>
<li>
<strong><a href="https://gitlab.freedesktop.org/pulseaudio/paprefs/-/commit/29d196d21674a67792d66bd3a3bdf472c22a7f44">29d196d2</a></strong>
<div>
<span>by Tanu Kaskinen</span>
<i>at 2022-01-12T17:54:53+02:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge tag 'v1.2'
When I prepared the 1.2 release, things probably happpened in the
following order:
1. I created the preparation commits.
2. I created an MR containing those commits.
3. I merged the MR using Marge. Marge amended the commit messages
with links to the MR.
4. I tagged the last local commit.
5. I pushed the tag.
In step 4 I should have reset my local checkout to the version on the
origin repo, which had diverged from my local version due to Marge's
commit message modifications. I didn't do that, so the master branch
ended up pointing to a different version than the tagged commit. This
merge commit makes the tagged commit part of the master branch.
</pre>
</li>
</ul>
<h4>0 changed files:</h4>
<ul>
</ul>
<h4>Changes:</h4>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #666;">
—
<br>
<a href="https://gitlab.freedesktop.org/pulseaudio/paprefs/-/compare/59ccdf5b5509a4037d00a12b032fb99a52e6d431...29d196d21674a67792d66bd3a3bdf472c22a7f44">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.freedesktop.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>