git terminology is "squash" On Mon, Jan 12, 2009 at 11:54 PM, bill lam <cbill.lam@xxxxxxxxx> wrote:>> 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@xxxxxxxxxxxxxxx> More majordomo info at http://vger.kernel.org/majordomo-info.html?韬{.n?????%??檩??w?{.n???哜?^n?■???h?璀?｛?夸z罐?+€?zf＂?????i?????_璁;?:+v??撸?
