Git : Rebasing Refactoring Amending

-
As if I still don't know everything about git. This week learn about rebasing and amending, rewriting git history as the prof described it. So let's say you're writing a word document and you're in the editing phase. You violently mash Ctrl+S every time you make a small fix. Adding punctuation, deleting a word, making a new line, you save again and again and again. Now imagine if you had a log for every time you save that file, like a git commit. Now that's a lot of entries, and we as coders do this with git commiting as well, but with git saving and tracking each one of those commits, our logs get a bit convoluted and messy. That's why git rebasing and amending is here to save the day.

So for this week's lab our prof wanted us to practice these new git concepts by polishing our code and git commiting to our hearts content, since we will be rebasing in the end. So I made my changes and made a couple of commits to the code. Once I was satisfied with the changes it was time to do a interactive rebase. P.S. I keep forgetting to screenshot actual progress of these labs so don't mind the throwaway branch and commits for the sake of visual examples.


Interactive Rebase
Amend
  
The interactive rebase is quite a useful way to edit your past commits with a lot of options and functionalities, the generated git file you interact with is quite a neat tool. For the lab, we were instructed to pick our first commit and squash the rest, which basically means that all the commits will be merged into one. After that amending it to edit the name to indicate the 3 commits in a better format. After that the branch is ready to be merged with the master.





I wish I knew about this feature even a week earlier, my last PR to a repo was filled with 3 commits since I keep finding small discrepancies that I make a new commit for, to the point that I just stopped making edits to not clog up the commit for the PR. Anyways, I see myself git rebasing/amending a lot in the future. 

To Git-ting better at git.

Thanks for reading.

Comments

Post a Comment

Popular posts from this blog

Release 0.3 : Telescope and The Quest for Infinity.... Scroll

-
Image
Welcome adventurers, sit down while I tell a little story of a brave programmer who slayed an issue so boldly, his PR request broke a record all time high of 57 comments. Alright so Release 0.3. Got it done right on time, just by the hair... I took on an issue on Telescope that was to add paging functionality to the search results, which also related to the another issue which is to enable infinite scrolling to the same component. Prior to this, humphd (our valiant maintainer and professor, whos been reviewing like a million PRs for the past few days.) has already added the SWR react hook to implement the same feature but on the home page feed. So I used that as a reference point. Issue #1222 I started work on the issue and first tried to implement the swr react hook with the current search components we had. This was confusing and tricky since with a search page we want to wait for the parameters for the search to be entered and then wait for the user to click the search button befor
Read more

Introduction

-
Hi everyone, welcome to my blog. My name is Joel Azwar and I'm a student/amateur programmer studying Computer Programming and Analysis in Seneca College in Toronto. I've taken up an Open Source Development course this semester and this blog is going to be dedicated to my ventures into open source technology and the progress that comes along with learning about it. So it's going to be my personal developer journal.  Open Source technology is something that's always intrigued me about the field of programming. I think it's quite fascinating how programmers all around the world can combine each other's efforts to improve, fix, or change something very drastically. Regardless of what they do, it helps advance the project one way or another which is a positive all around.  The scale of it is also quite captivating. There are millions of developers all around the world and they can contribute to any open source projects. I truly believe open source technology is a qui
Read more