Squashing multiple commits into one with GIT

Squash Multiple Git Commits Into One:

How I setup my terminal in this video:

Customizing your Command Prompt (with iTerm) on MacOS for Productivity

#git #squash #iterm

[_-Skeptic-_]

Straight forward approach. All needed information in few minutes.

[jefferysimon]

Andrew, thank you for presenting a thorough, concise example on rebase -i. So many demos out their either assume knowledge or leave out an important detail. Appreciate it!

[cseckler]

This video is awesome! So clearly explained! I wish you had more GIT walkthroughs.

[kammi]

Thank you for this video! Went from not knowing how to squash to being able to do this quite comfortably! :D

[ishansrt]

You are the best. I spent 2 days once figuring out that "-w" with my editor. Wish I had watched it before.

[zeeeeeman]

I was struggling with this today. Thank you very much!

[arnisteingrimursteinunnars]

Really nice introduction. Also, I've been toiling with vim when I could have changed it to emacs ages ago. Thanks for that too.

[ruixue]

0:48 init
1:12 5 comits A B C D E
1:39 git log to see the 5 commits
2:20 merge commit E, D, C into B
2:40 *git rebase -i HEAD~4*
4:21 squash down E, D, C into B
4:45 use *f* (fixup) 4:53 clean up commit message of B, C, D

[nikhil]

bookmark 2:36
git rebase -i HEAD~4
f for cleanup,
pick for keeping and remove all other commits

[dharmshalevarsha]

How to close the file opened using 'subl -n -w'?

[LeonGaban]

Hi this works great! However running into a problem with a huge long list of commits... after the first time, I can't continue. Keep getting cannot 'fixup' without a previous commit and cannot 'squash' without a previous commit

[bandogbone]

When you see END in reverse video at the bottom of the screen, you're in less (not vim), which git uses to display read-only output. Some navigation commands are the same in both less and vim.

[tonkihonks]

2:19 E, D, C, into B, rather than E, D, C, B into A?

[HaiderAli-cojl]

How to save after doing fix and reword in nano editor?

[dharmshalevarsha]

Thanks it works .
But when I have used this process for second time I have a problem: waiting for editor to close the file ...subl -n -w'

Please tell how to close this file.

[ehsanganjidoost]

How you made your cursor shows like this? What plugin/addons, ...you have installed? Thanks

[fennecinspace]

how do you get your termianl to look like this

[ashvinsuthar]

Your shell looks awesome, do mind sharing the script for it ;-)

[sergiveramartinez]

How you edit this terminal so good?? By the way, great video!

[scottfwalter]

How did you get your prompt to have that blue arrow?