How to squash and rebase in git

Рет қаралды 10,866

2 жыл бұрын

Git rebase is a handy tool to have for creating nice clean history in your git repository. Come on in to see how it works and how it can help you clean up your commit history.
Level Up
Data Structures & Algorithms
www.udemy.com/course/the-swif...
Level Up AutoLayout
www.udemy.com/course/level-up...
Level Up in Swift
www.udemy.com/course/level-up...
Twitter
@jrasmusson

Пікірлер: 26

@limonatamber 11 ай бұрын

Thank you!!! A lot of people say ":wq", but they didn't mention press "esc" before that !!!! That's why I found your video! Save my day!

@fiendgrin 6 ай бұрын

ngl, the only video that actually helped me understand squash, and taught me how to use it

@user-em9js9el5g 3 ай бұрын

Happy to see howard from better call saul is doing good and switched careers to software engineering .

@indracahyadi4757 7 ай бұрын

Very nice tutorial! 🎉

@GorillaDev417 2 жыл бұрын

Awesome video man! Definitely going to start using this!

@swiftarcade7632 2 жыл бұрын

Excellent! Let me know if you have any questions.

@DebugWithAdam Жыл бұрын

Superb, in a short video, I learned a lot ;)

@romancebula1263 2 жыл бұрын

And once again your video helped me a lot …. I was struggling with this editor and now I know how to deal with it:) Thanks again 🍺🍺

@swiftarcade7632 2 жыл бұрын

You are not the only one. It definitely takes some getting used to. Most welcome 🚀.

@andonidasilvaotero9652 2 жыл бұрын

Good and simple tutorial. Thanks Jonathan

@swiftarcade7632 2 жыл бұрын

Very welcome Andoni - thanks for coming by!

@abymathew575 2 жыл бұрын

you are really a great teacher

@swiftarcade7632 2 жыл бұрын

Thank you Aby. Much appreciated.

@janvikalra6490 Жыл бұрын

super helpful! thanks a bunch

@dylanngo4454 4 ай бұрын

Thank you so much bro :))

@rachelemsley5972 2 жыл бұрын

Use the fixup option if you don't want the commit messages for the commits you're squashing

@swiftarcade7632 2 жыл бұрын

No way - I didn't even know you could do that. Trying now. Thanks Rachel!

@lokeshios927 2 жыл бұрын

Nice One... Please Do video on difference between merge and rebase

@swiftarcade7632 2 жыл бұрын

Thanks for the suggestion Lokesh. Merge just merges two branches together respecting the history. Rebase just replays your changes on top of the branch you rebase too. I prefer rebase, because that way I never mess up the branch I am merging too (any conflicts are my own). But I have heard others say they like merge for reason (though I am not sure why). Some googling will no doubt better explain the differences. That's my best explanation for now. Cheers and thank you for asking. Will see if I can create a video one day because it is a popular question.

2 жыл бұрын

Thanks for the handy commands Jonathan. Would be great if you could make a video about mirror a huge git repo. Let's say we have a huge git log history, as well the source code size. But new repository has a size limitation. So, what I would like to do, push only last a few commits to the new repo. I'll keep my original repo in origin, but mirror the new repo for less commits. I just noticed that whenever I want to sync repos, do I have to take care of push commit (always commit after the last commit). I assume this command will push whole history `git push mirror master` Or what is the best practice to reduce the size of log history (one way is squash yes but doing that will also take time), also in the past accidentally they have submitted SDKs source codes into the repo where it is root cause of the huge size...

@swiftarcade7632 2 жыл бұрын

Hi Nesim. Once option for reducing the size of a huge repos is to just create a new repos, copying the latest version in there, and then starting all over. Yes you lose the history, but if you don't really care it can greatly reduce the size of your repos - by starting fresh. All the best!

2 жыл бұрын

@@swiftarcade7632 Thank you very much for your kind reply. Yes, will go that way as it is temporary.

@swiftarcade7632 2 жыл бұрын

@ No problem. And good luck!