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

Commits on Jun 7, 2022

  1. initial setup (broken!) for using regular git rebase to create initia… 

    …l todo

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    8ffee7c View commit details
    Browse the repository at this point in the history

  2. stop writing custom rebase files 

    Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    a95bb37 View commit details
    Browse the repository at this point in the history

  3. allow passing in custom git config getter, extract other default options 

    Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    6fdb3b0 View commit details
    Browse the repository at this point in the history

  4. use native git rebase to both find commits & launch the actual rebase 

    Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    8c6cc7f View commit details
    Browse the repository at this point in the history

  5. no longer use native rebase to find commits 

    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
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    f6381d9 View commit details
    Browse the repository at this point in the history

  6. fix: fix multiple issues by adding break as first cmd to git-rebase… 

    …-todo and `--continue`ing after launching rebase

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    54171c6 View commit details
    Browse the repository at this point in the history

  7. fix: always markThatNeedsToApply, until proven otherwise (TBD) 

    Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    6dd3c25 View commit details
    Browse the repository at this point in the history

  8. fix: add grey mark - will eventually need to apply if rebase exits 

    Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
    @kiprasmel
    kiprasmel committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    0ecff8c View commit details
    Browse the repository at this point in the history