[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: quotearg: implement custom_quoting_style
From: |
Bruno Haible |
Subject: |
Re: quotearg: implement custom_quoting_style |
Date: |
Mon, 24 Aug 2009 01:15:38 +0200 |
User-agent: |
KMail/1.9.9 |
Joel E. Denny wrote:
> > 4. "git rebase -i HEAD~3" and in the editor change
> > pick 3
> > pick 4
> > pick 5
> > into
> > pick 3
> > squash 5
> > pick 4
> > (where the numbers 3, 4, 5 are more complicated than that).
>
> 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.
> 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^
And I admit, I've never used "git cherry-pick", and avoid "git reset --hard".
Bruno