Re: how to combine 2 commits?

From: Jeff Whiteside <jeff.m.whiteside@gmail.com>
Date: Jan 13, 2009, 05:08 UTC
Message-ID: <3ab397d0901122108t7ae465feocd09b73ce4d525b2@mail.gmail.com>
In-Reply-To: <20090113045422.GA6940@b2j>

git terminology is "squash"

On Mon, Jan 12, 2009 at 11:54 PM, bill lam <cbill.lam@gmail.com> wrote:

Show 21 quoted lines

>
> Sorry I don't know the correct git terminology for it.  I make some
> changes to scripts but also accidentally changed all scripts to use
> dos linefeed.  Failed to notice this and commit all changes. Then I
> tried to correct it by changing all scripts back to unix linefeed and commit again.
>
> How to combine these 2 commits so that the changes of linefeed cancel
> out each other and the history only shows the intended changes of the
> few scripts.
>
> --
> regards,
> ====================================================
> GPG key 1024D/4434BAB3 2008-08-24
> gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3
> 唐��234 李白  怨情
>    美人�灾楹�  深坐蹙蛾眉  但���I痕��  不知心恨�l
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html