Re: [RFC PATCH v4 1/9] git-submodule.sh:cmd_update: if submodule branch exists, fetch that instead of default

From: Eddy Petrișor <eddy.petrisor@gmail.com>
Date: Apr 19, 2018, 05:43 UTC
Message-ID: <CAK0XTWcOpb5DS5c0MAomfaS2G0TPDTDtchm9FhkOSDBS5r5j+g@mail.gmail.com>
In-Reply-To: <CAGZ79kZL_+AZx2kFyoOokUPsqRzQFT32aj1XqHf8o7OJFwsABA@mail.gmail.com>

2018-04-19 2:53 GMT+03:00 Stefan Beller <sbeller@google.com>:

Show 5 quoted lines

> 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.

Show 9 quoted lines

> 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