On Thu, Dec 10, 2020 at 11:50:08PM +0100, Stefan Sperling wrote:
> On Thu, Dec 10, 2020 at 10:31:57PM +0000, Josh Rickmar wrote:
> > This patch adds a -f flag to histedit (analogous to -m) to execute a
> > histedit script which folds all commits into a single commit.
> 
> Thanks!
> I've tested the feature and it works well. Very nice!
> 
> One thing that is sorely missing is a test case. Do you want to add one?
> 
> > +.It Fl f
> > +Fold all commits into a single commit.
> > +This option is a quick equivalent to a histedit script which folds all
> > +but the final commit into the final picked commit.
> 
> I'm uneasy with the above wording. Couldn't it be misunderstood as saying
> that the second-to-last commit will not be picked? I think what is
> potentially unclear is whether "final commit" and "final picked commit"
> refer to the same commit or to two different commits.
> 
> Perhaps we could use 'combine' as a hint in addition to 'fold', for clarity:
> 
>   "This option is a quick equivalent to a histedit script which folds all
>   commits, combining them all into one commit."
> 
> That would read clear enough and non-ambiguous to me.
> 

Agree.

> The rest looks good to me.

-- 

Tracey Emery