<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=utf-8">
<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:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
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";}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
span.EmailStyle19
{mso-style-type:personal-reply;
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="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US">Ah yes, but it had a lot of OTHER stuff that I wanted. It was only the accidental change to a submodule that I wanted to kill off.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-family:"Calibri",sans-serif;mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif">From:</span></b><span lang="EN-US" style="font-size:11.0pt;font-family:"Calibri",sans-serif"> Harendra Kumar [mailto:harendra.kumar@gmail.com]
<br>
<b>Sent:</b> 30 September 2016 12:20<br>
<b>To:</b> Simon Peyton Jones <simonpj@microsoft.com><br>
<b>Cc:</b> Edward Z. Yang <ezyang@mit.edu>; ghc-devs <ghc-devs@haskell.org><br>
<b>Subject:</b> Re: git question<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
When you do 'git rebase -i', to exclude the commit you can just delete that commit from the list of commits.<o:p></o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
-harendra<o:p></o:p></p>
</div>
</div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
On 30 September 2016 at 16:40, Simon Peyton Jones via ghc-devs <<a href="mailto:ghc-devs@haskell.org" target="_blank">ghc-devs@haskell.org</a>> wrote:<o:p></o:p></p>
<blockquote style="border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm">
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
Thanks... that worked.<br>
<br>
Somehow it ought to be possible to un-stage the haddock change rather that carefully undo it manually. But it worked so I'm not complaining!<br>
<br>
Thank you<br>
<br>
Simon<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<br>
| -----Original Message-----<br>
| From: ghc-devs [mailto:<a href="mailto:ghc-devs-bounces@haskell.org">ghc-devs-bounces@haskell.org</a>] On Behalf Of<br>
| Edward Z. Yang<br>
| Sent: 30 September 2016 11:53<br>
| To: ghc-devs <<a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a>><br>
| Subject: Re: git question<br>
|<br>
| Get to the commit you want to edit, then<br>
|<br>
| cd utils/haddock<br>
| git checkout 073d899a8f94ddec698f617a38d3420160a7fd0b<br>
| cd ../..<br>
| git commit --amend -a<br>
|<br>
| Excerpts from Simon Peyton Jones via ghc-devs's message of 2016-09-30<br>
| 10:47:24 +0000:<br>
| > Friends<br>
| > I have a batch of several commits lined up on my local machine,<br>
| validated, and ready to push to the master.<br>
| > But one seems to have accidentally got<br>
| ><br>
| > diff --git a/utils/haddock b/utils/haddock<br>
| ><br>
| > index 073d899..a3309e7 160000<br>
| ><br>
| > --- a/utils/haddock<br>
| ><br>
| > +++ b/utils/haddock<br>
| ><br>
| > @@ -1 +1 @@<br>
| ><br>
| > -Subproject commit 073d899a8f94ddec698f617a38d3420160a7fd0b<br>
| ><br>
| > +Subproject commit a3309e797c42dae9bccdeb17ce52fcababbaff8a<br>
| > I did not want to meddle with Haddock.<br>
| > Question: how can I remove this change from my commit? I know how<br>
| to do git rebase –interactive, and I can aske to “edit” that commit…<br>
| but what then?<br>
| > Thanks<br>
| > Simon<br>
| _______________________________________________<br>
| ghc-devs mailing list<br>
| <a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a><o:p></o:p></p>
</div>
</div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
| <a href="https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.h" target="_blank">
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.h</a><br>
| <a href="https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Faskell.org&data=01%7C01%7Csimonpj%40microsoft.com%7C9e4ee9073f99470ea33e08d3e923c3dc%7C72f988bf86f141af91ab2d7cd011db47%7C1&sdata=WOvdVzIuLQzlGaUhPDFtiTvjTApyCr6whheU2Y%2Bt7QQ%3D&reserved=0" target="_blank">
askell.org</a>%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-<br>
| devs&data=01%7C01%7Csimonpj%<a href="https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2F40microsoft.com&data=01%7C01%7Csimonpj%40microsoft.com%7C9e4ee9073f99470ea33e08d3e923c3dc%7C72f988bf86f141af91ab2d7cd011db47%7C1&sdata=e%2Bld0pVnEGodsHaanaEgkHuqbtPhMdvB4gazfbKeyVo%3D&reserved=0" target="_blank">40microsoft.com</a>%7C6d4ef4135a94439fb54708d3<br>
| e91ffd21%7C72f988bf86f141af91ab2d7cd011db47%7C1&sdata=rNLWdOI3SNnfXPYj<br>
| PMHXC8U1l5sxI3eOwjHWaKpsBaY%3D&reserved=0<o:p></o:p></p>
<div>
<div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
_______________________________________________<br>
ghc-devs mailing list<br>
<a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a><br>
<a href="https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.haskell.org%2Fcgi-bin%2Fmailman%2Flistinfo%2Fghc-devs&data=01%7C01%7Csimonpj%40microsoft.com%7C9e4ee9073f99470ea33e08d3e923c3dc%7C72f988bf86f141af91ab2d7cd011db47%7C1&sdata=gz9aSJSVzufRNX3S3oR%2FcxboRDgWwuA3KnsRhy%2FF%2B%2Fo%3D&reserved=0" target="_blank">http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs</a><o:p></o:p></p>
</div>
</div>
</blockquote>
</div>
<p class="MsoNormal" style="mso-margin-top-alt:6.0pt;margin-right:0cm;margin-bottom:6.0pt;margin-left:0cm">
<o:p> </o:p></p>
</div>
</div>
</div>
</body>
</html>