bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: quotearg: implement custom_quoting_style


From: Joel E. Denny
Subject: Re: quotearg: implement custom_quoting_style
Date: Sun, 23 Aug 2009 20:40:00 -0400 (EDT)
User-agent: Alpine 1.00 (DEB 882 2007-12-20)

On Mon, 24 Aug 2009, Bruno Haible wrote:

> > Thanks.  I had never used "git rebase -i" before.  At the squash step, it 
> > let me merge the git log entries but not the ChangeLog entries.  Is there 
> > a way to do that?
> 
> Yes: After the rebase is done, edit the ChangeLog, and record that change
> through "git commit". Then again, "git rebase -i HEAD~3" and turn that
> last commit into a 'squash' right after the change to which is belongs.

I just thought of a trick that's a little simpler.  When rebase prompts me 
to edit the git log entry for the squash step, I just save an empty file, 
which makes the commit fail.  After I've staged my adjusted ChangeLog, I 
type "git rebase --continue", and I'm back to editing the git log entry.

> > For now, I stuck with what I know:
> > 
> >   git branch tmp
> >   git reset --hard HEAD^^
> >   git reset --soft HEAD^
> >   git cherry-pick -n tmp
> >   # Merge ChangeLog entries.
> >   git commit -a
> >   git cherry-pick tmp^

Replacing the "reset --soft" above with another "cherry-pick -n", it looks 
like I've been doing picks and squashes manually.

I won't anymore.  Thanks Bruno.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]