From: Stephan Beyer <s-beyer@gmx.net>
Date: Fri, 13 Jun 2008 12:16:07 GMT
Subject: Re: [RFCv2/FYI] git-sequencer.txt
Message-ID: <20080613121607.GC7925@leksak.fem-net>
In-Reply-To: <4851FFE9.30108@gnu.org>

>> squash [<options>] --from <mark>::
>> 	Squash all commits from the given mark into one commit.
>> 	There must not be any `merge` instructions between the
>> 	`mark` instruction and this `squash --from` instruction.
>
> --after maybe?

I have no idea what is best here ;-)
Something that seems intuitive when you see:

	merge ...
	mark :5
	pick 666babe
	patch foo.patch
	pick fa1afe1

Now?
1)  squash --up-to :5
2)  squash --from :5
3)  squash --after :5

(1) suggests the wrong direction...
My English feeling says that (2) "squash from" is better than 
(3) "squash after", but I'm not a native speaker ;-)

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F