<div dir="ltr">When you do 'git rebase -i', to exclude the commit you can just delete that commit from the list of commits.<div><br></div><div>-harendra</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 30 September 2016 at 16:40, Simon Peyton Jones via ghc-devs <span dir="ltr"><<a href="mailto:ghc-devs@haskell.org" target="_blank">ghc-devs@haskell.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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<br>
<div><div class="h5"><br>
|  -----Original Message-----<br>
|  From: ghc-devs [mailto:<a href="mailto:ghc-devs-bounces@haskell.org">ghc-devs-bounces@<wbr>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 073d899a8f94ddec698f617a38d342<wbr>0160a7fd0b<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 073d899a8f94ddec698f617a38d342<wbr>0160a7fd0b<br>
|  ><br>
|  > +Subproject commit a3309e797c42dae9bccdeb17ce52fc<wbr>ababbaff8a<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>
|  ______________________________<wbr>_________________<br>
|  ghc-devs mailing list<br>
|  <a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a><br>
</div></div>|  <a href="https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fmail.h" rel="noreferrer" target="_blank">https://na01.safelinks.<wbr>protection.outlook.com/?url=<wbr>http%3A%2F%2Fmail.h</a><br>
|  <a href="http://askell.org" rel="noreferrer" target="_blank">askell.org</a>%2Fcgi-bin%<wbr>2Fmailman%2Flistinfo%2Fghc-<br>
|  devs&data=01%7C01%7Csimonpj%<a href="http://40microsoft.com" rel="noreferrer" target="_blank">40<wbr>microsoft.com</a>%<wbr>7C6d4ef4135a94439fb54708d3<br>
|  e91ffd21%<wbr>7C72f988bf86f141af91ab2d7cd011<wbr>db47%7C1&sdata=<wbr>rNLWdOI3SNnfXPYj<br>
|  PMHXC8U1l5sxI3eOwjHWaKpsBaY%<wbr>3D&reserved=0<br>
<div class="HOEnZb"><div class="h5">______________________________<wbr>_________________<br>
ghc-devs mailing list<br>
<a href="mailto:ghc-devs@haskell.org">ghc-devs@haskell.org</a><br>
<a href="http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs" rel="noreferrer" target="_blank">http://mail.haskell.org/cgi-<wbr>bin/mailman/listinfo/ghc-devs</a><br>
</div></div></blockquote></div><br></div>