Skip to content

builtin rebase actions

Pratik Karki git 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 0 repliesNew

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7builtin rebase: support --continuebuiltin/rebase.c strbuf.c strbuf.h+123 -40 replies
2/7builtin rebase: support --skipbuiltin/rebase.c+18 -00 replies
3/7builtin rebase: support --abortbuiltin/rebase.c+20 -00 replies
4/7builtin rebase: support --quitbuiltin/rebase.c+11 -00 replies
5/7builtin rebase: support --edit-todo and --show-current-patchbuiltin/rebase.c+22 -10 replies
6/7builtin rebase: actions require a rebase in progressbuiltin/rebase.c+3 -00 replies
7/7builtin rebase: stop if `git am` is in progressbuiltin/rebase.c+5 -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/7] builtin rebase actions

The previous patch series implemented essential options and neccessary configurations. This patch series teaches all the rebase actions like --continue, --skip, --abort, et al. to builtin rebase.

These actions are important to operation of git rebase hence, are kept in a patch series of their own.

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

This is the third 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:

builtin rebase options: The builtin rebase will add all the options supported by original rebase.
builtin rebase rest: The builtin rebase will convert all the remaining shell scripts from the original rebase to C.
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 (7):
builtin rebase: support --continue
builtin rebase: support --skip
builtin rebase: support --abort
builtin rebase: support --quit
builtin rebase: support --edit-todo and --show-current-patch builtin rebase: actions require a rebase in progress builtin rebase: stop if git am is in progress

 builtin/rebase.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++-
 strbuf.c         |   9 +++
 strbuf.h         |   3 +
 3 files changed, 201 insertions(+), 4 deletions(-)
Signature · 1 line
2.18.0