From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Sitaram Chamarty <sitaramc@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how to combine 2 commits?
Date: Tue, 13 Jan 2009 07:48:00 +0100 [thread overview]
Message-ID: <vpqiqojpuqn.fsf@bauges.imag.fr> (raw)
In-Reply-To: <slrngmodgv.ple.sitaramc@sitaramc.homelinux.net> (Sitaram Chamarty's message of "Tue\, 13 Jan 2009 06\:35\:11 +0000 \(UTC\)")
Sitaram Chamarty <sitaramc@gmail.com> writes:
> I like using "git rebase -i HEAD~5" (if I want to rebase the
> last 5 commits). In the editor that pops up, I reorder the
> ones that I know should be together, and on each set to be
> squashed, I change the "pick" to "s" (for squash) on all but
> the first one. Save the file and it's all done.
And right after, you probably want to do stg like
git diff master@{1} master
to see whether you actually changed the result by reordering your
patches.
--
Matthieu
next prev parent reply other threads:[~2009-01-13 6:52 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.
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 [this message]
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=vpqiqojpuqn.fsf@bauges.imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=sitaramc@gmail.com \
/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