<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=Windows-1252">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin-top:6.0pt;
margin-right:0cm;
margin-bottom:6.0pt;
margin-left:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p.Code, li.Code, div.Code
{mso-style-name:Code;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:9.0pt;
font-family:"Courier New";
mso-fareast-language:EN-US;}
span.EmailStyle18
{mso-style-type:personal-compose;
font-family:"Calibri",sans-serif;
color:windowtext;
font-weight:normal;
font-style:normal;
text-decoration:none none;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;
mso-fareast-language:EN-US;}
.MsoPapDefault
{mso-style-type:export-only;
margin-top:6.0pt;
margin-right:0cm;
margin-bottom:6.0pt;
margin-left:0cm;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:12.0pt">Friends<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">I have a batch of several commits lined up on my local machine, validated, and ready to push to the master.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">But one seems to have accidentally got<o:p></o:p></span></p>
<p class="Code">diff --git a/utils/haddock b/utils/haddock<o:p></o:p></p>
<p class="Code">index 073d899..a3309e7 160000<o:p></o:p></p>
<p class="Code">--- a/utils/haddock<o:p></o:p></p>
<p class="Code">+++ b/utils/haddock<o:p></o:p></p>
<p class="Code">@@ -1 +1 @@<o:p></o:p></p>
<p class="Code">-Subproject commit 073d899a8f94ddec698f617a38d3420160a7fd0b<o:p></o:p></p>
<p class="Code">+Subproject commit a3309e797c42dae9bccdeb17ce52fcababbaff8a<o:p></o:p></p>
<p class="MsoNormal"><span style="font-size:12.0pt">I did not want to meddle with Haddock.
<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Question: how can I remove this change from my commit? I know how to do git rebase –interactive, and I can aske to “edit” that commit… but what then?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt">Simon<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:12.0pt"><o:p> </o:p></span></p>
</div>
</body>
</html>