From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
To: newren@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com, rohit.ashiwal265@gmail.com
Subject: Re: What's cooking in git.git (Jul 2019, #06; Thu, 25)
Date: Sun, 28 Jul 2019 02:27:32 +0530 [thread overview]
Message-ID: <20190727205732.16361-1-rohit.ashiwal265@gmail.com> (raw)
In-Reply-To: <CABPp-BEq+d=9G+U4im4fSEL2jGhggBwpoa+X7ZUjEGMPOPuFTw@mail.gmail.com>
Hi Elijah
On Sat, 27 Jul 2019 13:40:13 -0700 Elijah Newren <newren@gmail.com> wrote:
>
> Let me attempt to answer on Junio's behalf...
:)
> [...]
> 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.
Understood!
> > > - 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.
If applied in this order, I think, there is no need of fixups.
But renaming t3431 to t3433 is still required.
> > 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?
I am thinking of mergin the original topics, yes, just like Junio did.
> In general, once submitted, avoid rebasing unless needed to integrate
> with someone else's work and clean up conflicts.
I have not checked but git/git:master is like 569 commits ahead of
r1walz/git:master, there _might_ be conflicts. Should I rebase if
need be?
Thanks
Rohit
next prev parent reply other threads:[~2019-07-27 21:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 0:19 What's cooking in git.git (Jul 2019, #06; Thu, 25) Junio C Hamano
2019-07-26 14:33 ` Johannes Schindelin
2019-07-26 20:23 ` Junio C Hamano
2019-07-27 19:38 ` Rohit Ashiwal
2019-07-27 20:40 ` Elijah Newren
2019-07-27 20:57 ` Rohit Ashiwal [this message]
2019-07-27 21:42 ` Elijah Newren
2019-07-28 20:34 ` Carlo Arenas
2019-08-09 0:13 ` Taylor Blau
2019-08-09 1:34 ` Ariadne Conill
2019-08-09 2:07 ` Taylor Blau
2019-08-09 3:04 ` Ariadne Conill
2019-08-09 3:07 ` Phil Hord
2019-08-09 3:21 ` Ariadne Conill
2019-08-09 11:21 ` Taylor Blau
2019-08-09 11:41 ` Jeff King
2019-08-09 17:39 ` Phil Hord
2019-08-09 14:06 ` Randall S. Becker
2019-08-09 16:29 ` Jeff King
2019-08-09 16:32 ` Randall S. Becker
2019-08-09 17:45 ` Junio C Hamano
2019-08-09 18:05 ` Phil Hord
2019-08-10 6:10 ` Jeff King
2019-08-12 0:39 ` Junio C Hamano
2019-08-12 13:39 ` Randall S. Becker
2019-08-09 17:44 ` Junio C Hamano
2019-08-09 19:06 ` Randall S. Becker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190727205732.16361-1-rohit.ashiwal265@gmail.com \
--to=rohit.ashiwal265@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).