From: "Eddy Petrișor" <eddy.petrisor@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: "Eddy Petrișor" <eddy.petrisor@codeaurora.org>,
"Jonathan Nieder" <jrnieder@gmail.com>, git <git@vger.kernel.org>
Subject: Re: [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default
Date: Thu, 19 Apr 2018 08:43:38 +0300 [thread overview]
Message-ID: <CAK0XTWcOpb5DS5c0MAomfaS2G0TPDTDtchm9FhkOSDBS5r5j+g@mail.gmail.com> (raw)
In-Reply-To: <CAGZ79kZL_+AZx2kFyoOokUPsqRzQFT32aj1XqHf8o7OJFwsABA@mail.gmail.com>
2018-04-19 2:53 GMT+03:00 Stefan Beller <sbeller@google.com>:
> Hi Eddy,
>
> all the following patches 3-9 are touching the test as added in patch
> 2, which would go best with this patch.
> Could you squash all commits into one?
Yes,
I did not have time yesterday to put all changes into a single commit
with an associated note (because note managment seems to be a huge
pain), so I preferred small commits.
But I wanted to get your feedback on something, I'll reply in thread
arm where you actually suspected the problem.
> There are a couple ways to do it:
>
> git reset --soft
> git commit -a --reuse-commit-message=<...>
>
> or using
>
> git rebase --interactive origin/master
> # and then marking all but the first as "fixup"
I am aware of git rebase -i and use it regularly, that's why patches
3-9 have the 'fixup' prefix.
> I think the end result looks good, but that is best reviewed as one
> piece instead of 9 patches.
--
Eddy Petrișor
next prev parent reply other threads:[~2018-04-19 5:43 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1520366804-28233-1-git-send-email-eddy.petrisor@gmail.com>
2018-03-06 20:21 ` [RFC PATCH] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default Jonathan Nieder
2018-03-08 19:29 ` Eddy Petrișor
2018-03-08 19:41 ` Eddy Petrișor
2018-03-16 21:33 ` Thomas Gummerer
2018-03-16 21:44 ` Eric Sunshine
[not found] ` <CAK0XTWcNySGgwgFgCPDnZ+m=2hfEgswHbJKYeu+LQfuQ9_=shQ@mail.gmail.com>
2018-03-17 19:11 ` Thomas Gummerer
2018-03-18 1:43 ` Eric Sunshine
2018-03-26 23:06 ` Stefan Beller
[not found] ` <CAK0XTWd7QGtVDwm8FDXejZfbgVH6-1NprGY0xxAnC33QH8aCCQ@mail.gmail.com>
2018-03-29 20:54 ` Fwd: " Eddy Petrișor
[not found] ` <20180329225502.20112-1-eddy.petrisor@gmail.com>
2018-03-29 22:59 ` [RFC PATCH v2] " Eddy Petrișor
2018-04-03 22:20 ` [RFC PATCH v3 1/2] " Eddy Petrișor
2018-04-03 22:20 ` [RFC PATCH v3 2/2] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-03 22:26 ` Eddy Petrișor
2018-04-04 18:36 ` Stefan Beller
2018-04-04 20:37 ` Eddy Petrișor
2018-04-04 21:41 ` Stefan Beller
2018-04-18 22:35 ` [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default Eddy Petrișor
2018-04-18 23:53 ` Stefan Beller
2018-04-19 5:43 ` Eddy Petrișor [this message]
2018-04-18 22:35 ` [RFC PATCH v4 2/9] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 3/9] fixup:t7406: use test_commit instead of echo/add/commit as suggested by Stefan Beller Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 4/9] fixup:t7404:use 'git -C' instead of cd .. && git Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 5/9] fixup:t7406:cleanup chained submodules after test is done Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 6/9] fixup:t7406:don't call init after add, is redundant Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 7/9] fixup:t7406:supr5 commit is done before submodules chaining Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 8/9] fixup:t7406:use super_w instead of the existing super Eddy Petrișor
2018-04-18 22:35 ` [RFC PATCH v4 9/9] fixup:t7406:change branches in submodules after the link is done Eddy Petrișor
2018-04-19 6:07 ` [RFC PATCH v3 2/2] t7406: add test for non-default branch in submodule Eddy Petrișor
2018-04-19 17:52 ` Stefan Beller
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=CAK0XTWcOpb5DS5c0MAomfaS2G0TPDTDtchm9FhkOSDBS5r5j+g@mail.gmail.com \
--to=eddy.petrisor@gmail.com \
--cc=eddy.petrisor@codeaurora.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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).