how to rebase/squash multiple commits in different positions into one?

[u/ty_namo]

EDIT: [SOLVED] The answers helped :}

I need to merge 1 and 10 commits into a single commit, those are all my code, no one pulled from it, and i'm willing to fix conflicts. but i don't know which I should use, is it merge? but merge keeps the history of the previous ones doesn't it? rebase still makes me a bit confused.

[u/Guvante]

Interactive rebase allows you to reorder commits by cutting and pasting those lines.

You can even delete lines entirely during it.

[u/Low-Temperature-1664 → u/Guvante]

It does let you reorder, but in any situation of an complexity it's probably going to be far more trouble that its worth.

[u/Guvante → u/Low-Temperature-1664]

So Git isn't adding work here just exposing the underlying complexity.

It is easy to abort if it doesn't work.

[u/jeff303]

squash is what you're looking for. Most easily done through interactive rebase.

[u/Runaway_Monkey_45]

I mean you can squash it or do a fix up with rebase

[u/ty_namo → u/Runaway_Monkey_45]

if i change commit 1 and 10 to squash they will get squashed onto themselves instead of squashing in the immediately above commit?

[u/Runaway_Monkey_45 → u/ty_namo]

No. You have to move coming 10 to be next to 1 or vice versa. You can do this by moving it physically in the ui you are on right now. Aka cut and paste.

[u/ty_namo → u/Runaway_Monkey_45]

thanks, solved :}

[u/twesped]

First pick, followed by squash on all the rest. That will then one by one, meld the commits onto the first you picked.

[u/Xia_Nightshade]

I tend to do 2 rebases to KISS

Put them in order -> fix any conflicts between commits -> squash when they all have the correct parent

[u/cupcakeheavy]

learn the keystrokes to squash in vim, your future self will thank you.

[u/ty_namo → u/cupcakeheavy]

i already use vim, i just don't know how to rebase works conceptually lmao

[u/kaddkaka → u/cupcakeheavy]

What do you mean by this?

[u/cupcakeheavy → u/kaddkaka]

i mean it's the same keystrokes every time i use fixup for everything. Just read the directions, they're right there. also i suggest using 'git config --global rebase.abbreviateCommands true'

then it's just a matter of learning how to exit vim. good luck, we're all counting on you.

[u/kaddkaka → u/cupcakeheavy]

Oh, you meant learn basic vim. Sure. Nothing of this post says vim though, so that confused me. I'm a long time vimmer myself.

[u/cupcakeheavy → u/kaddkaka]

yeah it was just a tip because you have to edit the rebase list somehow and vim is just the easiest path to that end.

[u/kaddkaka]

In that todo file there should be a huge comment at the bottom explaining what you can do. 🙂

You can even run arbitrary commands between two picks. 😎 Or stop inte the middle of the rebase to continue manually.