How to set up a rebase in Git Bash on Windows

Question

I'm trying to following the instructions on https://help.github.com/articles/using-git-rebase-on-the-command-line/ for interactively rebasing from my initial commit (More specifically, I'm trying to remove all the bin and obj folders from the history). So once I type in

git rebase -i --root

I get the following screen as expected, but then I can't figure out how to change the first one to edit. Like I can't figure out which button on the keyboard to click. Sorry if this is a stupid question.

Check out the basic VIM commands, video tutorials are pretty handy. — hkarask
– hkarask, Commented Mar 31, 2017 at 7:43

ckruczek · Accepted Answer · 2017-03-31 07:42:30Z

13

Thats pretty easy. You have to change the word pick to edit Then you save the file, in your case press ESC and then type :wq. Then git will start the rebase and you will stop on each commit you want to edit.

Edit: If you don't know how to insert in vim: press ESC and then i after that you are in insert-mode and as soon as you are finished with typing press ESC again and save it as described above.

edited Mar 31, 2017 at 7:42

answered Mar 31, 2017 at 7:36

ckruczek

2,4202 gold badges22 silver badges23 bronze badges

Sign up to request clarification or add additional context in comments.

1 Comment

Demonslay335 Over a year ago

I think the OP may be in the same camp as I was; I had no idea this screen was vim. That hint alone is of great help!

Manoj V · Accepted Answer · 2024-02-16 12:06:49Z

-1

I faced a problem in doing squash commit on my Windows CMD and wanted to reproduce the steps I used to do squash commit on my Windows CMD as I felt the previous answer is not a complete guide on doing squash commit in Windows CMD.

Squashing commits into a single commit:

git rebase -i HEAD~(Enter number of commits to be squashed)
Press "i" to insert
Now replace 'pick' with 's' for all unwanted commit messages
Press Esc and then type ":wq"
The above will open a new console. Remove all the unwanted commit lines
Press Esc and then type ":wq" again

Your squash has now been completed.

Now the final step is to push the branch again with the command:-

git push origin (branch-name) -f

answered Feb 16, 2024 at 12:06

Manoj V

294 bronze badges

Collectives™ on Stack Overflow

How to set up a rebase in Git Bash on Windows

2 Answers 2

1 Comment

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

1 Comment

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related