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

feat: implement autoSquash! #18

Open
wants to merge 3 commits into
base: allow-multiple-branches-on-same-commit
Choose a base branch
from
Open

feat: implement autoSquash! #18

wants to merge 3 commits into from

Conversation

kiprasmel
Copy link
Owner

@kiprasmel kiprasmel commented May 12, 2022 •
edited
Loading

  • handle rev-parse better (e.g. currently @~ doesn't work)
  • add CLI arg --autosquash if ppl want to run it once w/o config, just like regular rebase

otherwise it's sick!! 🔥🔥

@kiprasmel kiprasmel force-pushed the feat/autosquash branch 3 times, most recently from e073890 to a81e0a2 Compare May 12, 2022 03:02
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from b713fcf to 62ad4b1 Compare May 28, 2022 20:58
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from 62ad4b1 to d2d4890 Compare May 28, 2022 22:54
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from d2d4890 to 9233d0a Compare May 28, 2022 23:17
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from 9233d0a to b8c6016 Compare May 28, 2022 23:40
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from b8c6016 to 3c26bde Compare May 28, 2022 23:55
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from 3c26bde to 497f684 Compare June 4, 2022 23:49
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from 497f684 to 19fc07c Compare June 7, 2022 02:49
@kiprasmel
feat: implement autoSquash!
69ef13c 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
as suspected, autoSquash was meant only for the actual rebase operation
8e8d9b6 
see next commit on how we realized this (hint: current impl is still broken)

Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel
implement commit and branch un-attaching & re-attaching 🔥
74fda6e 
Signed-off-by: Kipras Melnikovas <kipras@kipras.org>
@kiprasmel kiprasmel force-pushed the allow-multiple-branches-on-same-commit branch from 19fc07c to 680c208 Compare June 7, 2022 02:53
@kiprasmel kiprasmel marked this pull request as ready for review July 24, 2022 16:06
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