Re: What's cooking in git.git (Jul 2019, #06; Thu, 25)

[Elijah Newren <newren@gmail.com>]

Hi Rohit,

Let me attempt to answer on Junio's behalf...

On Sat, Jul 27, 2019 at 12:48 PM Rohit Ashiwal
<rohit.ashiwal265@gmail.com> wrote:
>
> Hi Junio
>
> On Thu, 25 Jul 2019 17:19:23 -0700 Junio C Hamano <gitster@pobox.com> wrote:
> >
> > * ra/rebase-i-more-options (2019-07-23) 4 commits
> >  - SQUASH???
>
> There are only 3 commits in this "series".

There are four, including Junio's commit he had to add in order to
make the series merge with pu (a rename of your t3431 to the
unoccupied t3433 slot).  He labelled that commit "SQUASH???" and it's
still quoted above.  However, in general, when you submit the next
round of your series, you should certainly include his fixups from his
squash (or alternative fixes) inside your commits in order to get rid
of the need for the squash commit.

> >  - rebase -i: support --committer-date-is-author-date
> >  - sequencer: add NULL checks under read_author_script
> >  - rebase -i: add --ignore-whitespace flag
>
> The correct order should be:
>    - rebase -i: add --ignore-whitespace flag
>    - sequencer: add NULL checks under read_author_script
>    - rebase -i: support --committer-date-is-author-date

Are you thinking in order of application, or order that would be shown
by `git log --oneline`?  Junio includes the latter in his report.

> I'll soon send another revision and while on it, let's merge
> these topics into one. Should I also rebase them on the tip
> of git/git's master?

What do you mean by merge these topics into one?  Do you mean merge
all the commits into a single commit (which would be bad), or that
your two original topics should be one, much like Junio already did?

In general, once submitted, avoid rebasing unless needed to integrate
with someone else's work and clean up conflicts.


Hope that helps,
Elijah