From: bill lam <cbill.lam@gmail.com>
To: git <git@vger.kernel.org>
Subject: how to combine 2 commits?
Date: Tue, 13 Jan 2009 12:54:22 +0800 [thread overview]
Message-ID: <20090113045422.GA6940@b2j> (raw)
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 李白 怨情
美人捲珠簾 深坐蹙蛾眉 但見淚痕濕 不知心恨誰
next reply other threads:[~2009-01-13 4:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-13 4:54 bill lam [this message]
2009-01-13 5:08 ` how to combine 2 commits? Jeff Whiteside
2009-01-13 5:27 ` Boyd Stephen Smith Jr.
2009-01-13 5:32 ` Imran M Yousuf
2009-01-13 7:51 ` bill lam
2009-01-13 11:20 ` Stephen R. van den Berg
2009-01-13 6:35 ` Sitaram Chamarty
2009-01-13 6:48 ` Matthieu Moy
2009-01-13 11:32 ` Sitaram Chamarty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090113045422.GA6940@b2j \
--to=cbill.lam@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.