Home » Mailing list archives » git » 2009 » January » 13

how to combine 2 commits?

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: bill lam
Subject: how to combine 2 commits?
Date: Monday, January 12, 2009 - 9:54 pm

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 李白  怨情
    美人捲珠簾  深坐蹙蛾眉  但見淚痕濕  不知心恨誰
--
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
how to combine 2 commits?, bill lam, (Mon Jan 12, 9:54 pm)
Re: how to combine 2 commits?, Jeff Whiteside, (Mon Jan 12, 10:08 pm)
Re: how to combine 2 commits?, Boyd Stephen Smith Jr., (Mon Jan 12, 10:27 pm)
Re: how to combine 2 commits?, Imran M Yousuf, (Mon Jan 12, 10:32 pm)
Re: how to combine 2 commits?, bill lam, (Tue Jan 13, 12:51 am)
Re: how to combine 2 commits?, Stephen R. van den Berg, (Tue Jan 13, 4:20 am)