Skip to content

builtin rebase options

Pratik Karki git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest18 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/18builtin rebase: allow selecting the rebase "backend"builtin/rebase.c+37 -00 replies
2/18builtin rebase: support --signoffbuiltin/rebase.c+17 -00 replies
3/18builtin rebase: support --rerere-autoupdatebuiltin/rebase.c+25 -00 replies
4/18builtin rebase: support --committer-date-is-author-datebuiltin/rebase.c+10 -00 replies
5/18builtin rebase: support `ignore-whitespace` optionbuiltin/rebase.c+6 -00 replies
6/18builtin rebase: support `ignore-date` optionbuiltin/rebase.c+8 -00 replies
7/18builtin rebase: support `keep-empty` optionbuiltin/rebase.c+24 -01 reply
8/18builtin rebase: support `--autosquash`builtin/rebase.c+10 -00 replies
9/18builtin rebase: support `--gpg-sign` optionbuiltin/rebase.c+27 -00 replies
10/18builtin rebase: support `-C` and `--whitespace=<type>`builtin/rebase.c+23 -00 replies
11/18builtin rebase: support `--autostash` optionbuiltin/rebase.c+109 -82 replies
12/18builtin rebase: support `--exec`builtin/rebase.c+18 -00 replies
13/18builtin rebase: support `--allow-empty-message` optionbuiltin/rebase.c+7 -00 replies
14/18builtin rebase: support --rebase-merges[=[no-]rebase-cousins]builtin/rebase.c+21 -00 replies
15/18merge-base --fork-point: extract libified functionbuiltin/merge-base.c commit.c commit.h+89 -750 replies
16/18builtin rebase: support `fork-point` optionbuiltin/rebase.c+11 -00 replies
17/18builtin rebase: add support for custom merge strategiesbuiltin/rebase.c+57 -00 replies
18/18builtin rebase: support --rootbuiltin/rebase.c+29 -20 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 00/18] builtin rebase options

This patch series completes the support for all rebase options in the builtin rebase. This converts the remaining command-line options.

The previous patch series taught the builtin rebase to handle different actions, this patch series will continue adding functionality to builtin rebase by teaching it to handle options handled by original rebase i.e. --signoff, rerere-autoupdate, et al.

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

This is the fourth 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 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 (18):
builtin rebase: allow selecting the rebase "backend" builtin rebase: support --signoff
builtin rebase: support --rerere-autoupdate
builtin rebase: support --committer-date-is-author-date builtin rebase: support ignore-whitespace option builtin rebase: support ignore-date option builtin rebase: support keep-empty option
builtin rebase: support --autosquash
builtin rebase: support --gpg-sign option
builtin rebase: support -C and --whitespace=<type> builtin rebase: support --autostash option builtin rebase: support --exec
builtin rebase: support --allow-empty-message option builtin rebase: support --rebase-merges[=[no-]rebase-cousins] merge-base --fork-point: extract libified function builtin rebase: support fork-point option
builtin rebase: add support for custom merge strategies builtin rebase: support --root

 builtin/merge-base.c |  81 +-------
 builtin/rebase.c     | 449 ++++++++++++++++++++++++++++++++++++++++++-
 commit.c             |  81 ++++++++
 commit.h             |   2 +
 4 files changed, 528 insertions(+), 85 deletions(-)
Signature · 1 line
2.18.0