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

feat(move): Add --fixup to squash moved commits into the destination #545

Merged
merged 7 commits into from
Aug 11, 2023
Merged

feat(move): Add --fixup to squash moved commits into the destination #545

merged 7 commits into from
Aug 11, 2023
+1,902 −196

Commits on Aug 11, 2023

  1. refactor(rebase): Store rewritten OIDs in a map

    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    76feaad View commit details
    Browse the repository at this point in the history

  2. test: Add functions to facilitate comparing changes within a file 

    Existing test functions are aimed more at checking the existence of files,
not necessarily the contents of them.
    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    be23ded View commit details
    Browse the repository at this point in the history

  3. refactor(repo): Rename CherryPickFastError to CreateCommitFastError

    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    7d2f1fc View commit details
    Browse the repository at this point in the history

  4. feat(repo): Add AmendFastOptions::FromCommit 

    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
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    9a6f630 View commit details
    Browse the repository at this point in the history

  5. refactor(rebase): Allow RebaseCommand::Pick to apply multiple commits 

    This is just the basic data structure support for holding multiple
commits. The actual implementation of applying multiple commits will
come next.
    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    bd56152 View commit details
    Browse the repository at this point in the history

  6. feat(rebase): Support squashing commits with RebaseCommand::Pick

    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    7ab4cdd View commit details
    Browse the repository at this point in the history

  7. feat(move): Add --fixup to squash moved commits into the destination 

    This only implements in-memory rebases/fixups. On-disk rebases can come later.
    @claytonrcarter
    claytonrcarter committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    3ad2f74 View commit details
    Browse the repository at this point in the history