Re: [PATCH v3 00/11][Outreachy] Improve the 'fixup [-C | -c]' in interactive rebase

2 messages, 2 authors, 2021-02-11 · open the first message on its own page

Re: [PATCH v3 00/11][Outreachy] Improve the 'fixup [-C | -c]' in interactive rebase

From: Junio C Hamano <hidden>
Date: 2021-02-11 17:22:06

Charvi Mendiratta [off-list ref] writes:
This patch series is build on the top of "cm/rebase-i" in the 'next' branch and
improves it. It fixup the source code of 'fixup [-C | -c]' command in the
sequencer, do some fixes in rebase -i, improves the 'fixup_-C' like commands
in lib-rebase.sh, update the test-script 't3437' and fixes a typo in the
documentation.

Changes from v2 :
* Update the rebase-todo help
* Remove the changes and resets to fixup_-* command
* Update the documentation of FAKE_LINES
* Move the changes of "unnecessary curly braces in test" to the other patch
  (from v2-9/11 to v2-5/11)

Thanks all for the suggestions.
Thanks.  Looking good.  Unless there is any other nits, let's
declare victory and merge the two topics down to 'next' and then to
'master' for the next release?

Re: [PATCH v3 00/11][Outreachy] Improve the 'fixup [-C | -c]' in interactive rebase

From: Charvi Mendiratta <hidden>
Date: 2021-02-11 22:27:46

Hi Junio,

On Thu, 11 Feb 2021 at 22:49, Junio C Hamano [off-list ref] wrote:
[...]
Thanks.  Looking good.  Unless there is any other nits, let's
declare victory and merge the two topics down to 'next' and then to
'master' for the next release?
Thanks for confirming. Here in these two topics  `fixup -C` works with
"amend!" commit in interactive rebase and we are still working on some
improvements on the new patch series ( to be sent)  that implements
"amend! " commit . So I think to rebase that  work also on this topic,
to make project history clear and avoid the confusion ( it also
improves the same test script in this topic).

So maybe please wait for that, before merging to master.

Thanks and Regards,
Charvi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help