Skip to content

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

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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ffee7c
initial setup (broken!) for using regular git rebase to create initia…
kiprasmel Jan 18, 2022
a95bb37
stop writing custom rebase files
kiprasmel Apr 10, 2022
6fdb3b0
allow passing in custom git config getter, extract other default options
kiprasmel Apr 10, 2022
8c6cc7f
use native git rebase to both find commits & launch the actual rebase
kiprasmel Apr 10, 2022
f6381d9
no longer use native rebase to find commits
kiprasmel Jan 22, 2022
54171c6
fix: fix multiple issues by adding `break` as first cmd to git-rebase…
kiprasmel Jan 23, 2022
6dd3c25
fix: always `markThatNeedsToApply`, until proven otherwise (TBD)
kiprasmel Jan 25, 2022
0ecff8c
fix: add grey mark - will eventually need to apply if rebase exits
kiprasmel Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apply.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const getPaths = (
appliedPath: path.join(pathToStackedRebaseDirInsideDotGit, filenames.applied),
} as const);

const markThatNeedsToApply = (
export const markThatNeedsToApply = (
pathToStackedRebaseDirInsideDotGit: string //
): void =>
[getPaths(pathToStackedRebaseDirInsideDotGit)].map(
Expand Down
1 change: 1 addition & 0 deletions filenames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
export const filenames = {
rewrittenList: "rewritten-list",
willNeedToApply: "will-need-to-apply",
needsToApply: "needs-to-apply",
applied: "applied",
//
Expand Down
Loading