Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

native-rebase-for-creating-initial-git-rebase-todo #7

Draft
wants to merge 8 commits into
base: fix/applied-logic
Choose a base branch
from
Draft

native-rebase-for-creating-initial-git-rebase-todo #7

wants to merge 8 commits into from

Conversation

kiprasmel
Copy link
Owner

No description provided.

@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 9e77de4 to e705df0 Compare April 11, 2022 02:51
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from e705df0 to 0fc623f Compare May 8, 2022 08:44
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 0fc623f to 37f345b Compare May 8, 2022 09:01
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 37f345b to 92a21d4 Compare May 8, 2022 09:04
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 92a21d4 to df5bc3d Compare May 8, 2022 09:10
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from df5bc3d to e5a9c54 Compare May 8, 2022 09:24
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from e5a9c54 to 6148392 Compare May 28, 2022 20:59
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 6148392 to 9a48700 Compare May 28, 2022 23:56
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 9a48700 to 8c61c22 Compare June 7, 2022 02:50
@kiprasmel
initial setup (broken!) for using regular git rebase to create initia…
8ffee7c 
…l todo

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
stop writing custom rebase files
a95bb37 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
allow passing in custom git config getter, extract other default options
6fdb3b0 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
use native git rebase to both find commits & launch the actual rebase
8c6cc7f 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
no longer use native rebase to find commits
f6381d9 
seems pointless & hacky to launch 2 rebases instead of finding the
commits ourselves & then only launching the rebase when appropriate
to do the actual rebasing.
because of stuff like hooks etc., it just doesn't feel right.

i don't know if there's stuff we're missing out on that native rebase
is better at, esp. w/ edge cases, but i suppose we'll have to find out.

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: fix multiple issues by adding break as first cmd to git-rebase…
54171c6 
…-todo and `--continue`ing after launching rebase

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: always markThatNeedsToApply, until proven otherwise (TBD)
6dd3c25 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
fix: add grey mark - will eventually need to apply if rebase exits
0ecff8c 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel kiprasmel force-pushed the native-rebase-for-creating-initial-git-rebase-todo branch from 8c61c22 to 0ecff8c Compare June 7, 2022 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@kiprasmel