Skip to content

builtin rebase rest

Pratik Karki git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6builtin rebase: optionally auto-detect the upstreambuiltin/rebase.c+41 -30 replies
2/6builtin rebase: optionally pass custom reflogs to reset_head()builtin/rebase.c+21 -120 replies
3/6builtin rebase: fast-forward to onto if it is a proper descendantbuiltin/rebase.c+18 -00 replies
4/6builtin rebase: show progress when connected to a terminalbuiltin/rebase.c+7 -00 replies
5/6builtin rebase: use no-op editor when interactive is "implied"builtin/rebase.c+7 -00 replies
6/6builtin rebase: error out on incompatible option/mode combinationsbuiltin/rebase.c+41 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [GSoC] [PATCH 0/6] builtin rebase rest

This patch pretty much converts all what is remaining from the shell-script version of git rebase to the builtin version. After the conversion of actions and different options which are important for builtin rebase and have been organized to make a patch series of their own. There were still some leftover shell scripts on the original rebase and hence, this patch series addresses those by converting them and this completes the builtin rebase.

It adds the functionality to the previous patch series,
(https://public-inbox.org/git/[email protected]/).

This is the fifth patch series that brings us more closer to a builtin "git rebase".

If you like to view the development branch, you can view
(https://github.com/git/git/pull/505), where I have kept my commits up to date and leveraged Travis(there is sporadic failures in t5520 for macos gcc and isn't due to my patches) for extra testing other than my system.

The next in line patch series which I'll be sending out today are:

default to builtin rebase: This will turn on the feature-complete builtin rebase to on.

These patch series are built on top of each other, i.e. they depend on this order.

Pratik Karki (6):
builtin rebase: optionally auto-detect the upstream builtin rebase: optionally pass custom reflogs to reset_head() builtin rebase: fast-forward to onto if it is a proper descendant builtin rebase: show progress when connected to a terminal builtin rebase: use no-op editor when interactive is "implied" builtin rebase: error out on incompatible option/mode combinations

 builtin/rebase.c | 150 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 135 insertions(+), 15 deletions(-)
Signature · 1 line
2.18.0