From: "Geoff Russell" <geoffrey.russell@gmail.com>
To: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>
Cc: "Miklos Vajna" <vmiklos@frugalware.org>, git@vger.kernel.org
Subject: Re: collapsing commits with rebase
Date: Thu, 8 Jan 2009 20:19:16 +1030 [thread overview]
Message-ID: <93c3eada0901080149m3c349e6bx33b58d653fd43b48@mail.gmail.com> (raw)
In-Reply-To: <200901072039.12631.bss@iguanasuicide.net>
On 1/8/09, Boyd Stephen Smith Jr. <bss@iguanasuicide.net> wrote:
> On Wednesday 2009 January 07 20:32:24 Miklos Vajna wrote:
> >On Wed, Jan 07, 2009 at 08:11:32PM -0600, "Boyd Stephen Smith Jr."
> <bss@iguanasuicide.net> wrote:
> >> git merge -s sha(D)
> >
> >You probably mean --squash here, -s stands for --strategy - and I *hope*
> >you don't have git-sha(D) in your PATH, as a custom merge strategy. ;-)
>
Many thanks, now I have plenty of ways to think about!
Cheers,
Geoff.
next prev parent reply other threads:[~2009-01-08 9:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-08 0:08 collapsing commits with rebase Geoff Russell
2009-01-08 0:45 ` Johannes Schindelin
2009-01-08 1:59 ` Geoff Russell
2009-01-08 11:07 ` Johannes Schindelin
2009-01-10 10:34 ` Geoff Russell
2009-01-08 2:11 ` Boyd Stephen Smith Jr.
2009-01-08 2:32 ` Miklos Vajna
2009-01-08 2:39 ` Boyd Stephen Smith Jr.
2009-01-08 9:49 ` Geoff Russell [this message]
2009-01-08 4:09 ` Sitaram Chamarty
2009-01-08 4:23 ` Boyd Stephen Smith Jr.
2009-01-10 10:26 ` nadim khemir
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=93c3eada0901080149m3c349e6bx33b58d653fd43b48@mail.gmail.com \
--to=geoffrey.russell@gmail.com \
--cc=bss@iguanasuicide.net \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.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;
as well as URLs for NNTP newsgroup(s).