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

Move fixup #34

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Move fixup #34

wants to merge 7 commits into from

Conversation

claytonrcarter
Copy link
Owner

@claytonrcarter claytonrcarter commented Apr 30, 2023 •
edited
Loading

No description provided.

@claytonrcarter claytonrcarter force-pushed the move-fixup branch 9 times, most recently from 465edce to 45ffcd6 Compare May 5, 2023 02:19
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 3 times, most recently from 9f40a2a to 01314f2 Compare May 22, 2023 01:06
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 2 times, most recently from ab5f836 to af8a2ac Compare June 7, 2023 13:27
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 5 times, most recently from 07797f4 to d3ecaf7 Compare June 28, 2023 02:54
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 5 times, most recently from 8f5ebec to 45299a9 Compare July 16, 2023 01:08
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 3 times, most recently from 0268458 to 1b93c7a Compare July 28, 2023 03:01
@claytonrcarter claytonrcarter force-pushed the move-fixup branch 3 times, most recently from da29097 to 0559a70 Compare August 9, 2023 02:29
@claytonrcarter
refactor(rebase): Store rewritten OIDs in a map
76feaad
@claytonrcarter
test: Add functions to facilitate comparing changes within a file
be23ded 
Existing test functions are aimed more at checking the existence of files,
not necessarily the contents of them.
@claytonrcarter
refactor(repo): Rename CherryPickFastError to CreateCommitFastError
7d2f1fc
@claytonrcarter
feat(repo): Add AmendFastOptions::FromCommit
9a6f630 
Existing `AmendFastOptions` only support amending from the working copy
or index, but we can't use either of these for implementing something
like squashing fixup commits because we need to use the entries from an
existing commit.
@claytonrcarter
refactor(rebase): Allow RebaseCommand::Pick to apply multiple commits
bd56152 
This is just the basic data structure support for holding multiple
commits. The actual implementation of applying multiple commits will
come next.
@claytonrcarter
feat(rebase): Support squashing commits with RebaseCommand::Pick
7ab4cdd
@claytonrcarter
feat(move): Add --fixup to squash moved commits into the destination
3ad2f74 
This only implements in-memory rebases/fixups. On-disk rebases can come later.
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
@claytonrcarter