REBASE WITH SMARTGIT HOW TO

No need to check out a reflog commit temporarily just to have a look at it. Want a diff between two commits, whether they be normal commits or stash or reflog commits? Click one commit, ctrl+click the other, and you instantly see the differences between the two. Turn on the checkbox to make a stash or all stashes visible and now they show up as ordinary commits, which is all they are under the hood. The reflog? Click the Recyclable Commits checkbox and now all of your reflog commits show up as ordinary commits just like any other. One thing I love about SmartGit is how it unifies features that the Git command line presents as separate and unrelated concepts. What if something goes wrong in the rebase? Now I've lost all my work and I have to pull a fresh copy of the repo from scratch.' Anything outside that brings terror: 'I never use rebase. People tell me, 'I'm so much more productive on the command line' and then it turns out all they know is pull/commit/push and using a local branch. I prefer SmartGit, but GitKraken is nice too. What puzzles me is how resistant many developers are to using or even considering a Git GUI. My guess is things will become a lot less tedious and confusing when things get messy.

REBASE WITH SMARTGIT HOW TO

Then, once you're comfortable, learn how to do it in a visual tool like Gitkraken and make an effort to incorporate them in to your daily workflow. Proper Git use is one of those hills I'll die on, though so I don't intend to shut up about it any time soon :)Įdit: My practical advice: If you use git every day and you don't know how to rebase, reset, cherrypick, and stash from the command line, make it a goal. I don't necessarily want to dictate nitpicky git usage but I have a hard time accepting when people just to refuse how rebasing and cherrypicking work when they're both core basic features of a tool we all use every day. I see it all because I have visibility in to the history and branch relationships but I still get shrugs and eye rolls when I bring it up. Still, I constantly struggle with coworkers merging feature branches from 100 commits ago in to new feature branches and brute force resolving conflicts across half a dozen files in one commit without any context. These days, the UI for rebasing and cherry picking in Gitkraken is state of the art and effortless and I use them every day without hesitation and without the fear that comes from not understanding or knowing what I'm doing. I was receptive and in about 10 minutes, I realized there was a significant set of standard features and day to day Git use I was previously just oblivious to. The result is, because developers only have a hammer, they brute force merge everything which results in grotesque conflict resolutions and commit histories and makes it hard to untangle problems.Īt a previous job, another developer was kind enough to walk through rebasing on the command line with vim. I think it's a tragedy that just about every developer uses git but most learn add, commit, branch, and merge and then just stop learning.Ī lot of people are scared of rebase and cherrypick and shut down or get defensive when you mention them or try to encourage their use.

Rebase with smartgit