From: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
To: git <git@vger.kernel.org>
Cc: bill lam <cbill.lam@gmail.com>
Subject: Re: how to combine 2 commits?
Date: Mon, 12 Jan 2009 23:27:16 -0600 [thread overview]
Message-ID: <200901122327.21102.bss@iguanasuicide.net> (raw)
In-Reply-To: <20090113045422.GA6940@b2j>
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
On Monday 12 January 2009, bill lam <cbill.lam@gmail.com> wrote about 'how
to combine 2 commits?':
>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.
Two ways I can think of:
git rebase --interactive (read "git help rebase" first)
git merge --squash (read "git help merge" first)
The rebase is probably semantically closer to how you are thinking about
things right now.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-01-13 5:28 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-13 4:54 how to combine 2 commits? bill lam
2009-01-13 5:08 ` Jeff Whiteside
2009-01-13 5:27 ` Boyd Stephen Smith Jr. [this message]
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=200901122327.21102.bss@iguanasuicide.net \
--to=bss@iguanasuicide.net \
--cc=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox