makandra dev
robots.thoughtbot.com

git command line options for automating common rebasing tasks, like adding a fix to a commit that was already rebased...

First find the reference for the entry you want through looking at the stash: $ git stash list stash@{0}: WIP...

Sometimes huge refactorings or refactoring of core concepts of your application are necessary for being able to meet new requirements...

If you are fine with the default console diff most of the time but only sometimes want to use an...

If you want to find the commits that touched a specific text in a file, use git log -S 'text...

Using the -U parameter you can change how many lines are shown above and below a changed section.

You might get the above error message when cloning certain git repositories (for example the rails repository). It indicates that...

github.com

We have released a new library Gemika to help test a gem against multiple versions of Ruby, gem dependencies and...

Similar to our snippet that runs all Cucumber features matching a given string, the following will run all modified or...

makandra dev
ohshitgit.com

Git is hard: screwing up is easy, and figuring out how to fix your mistakes is fucking impossible. Git documentation...

makandra dev

Sometimes you might need to nest a git-project inside another git-project. The right strategy is to use submodules...

ombulabs.com

Tool to show you which gems are slow to load: ➜ git:(master) ✗ bundle exec bumbler [################################################# ] (49/65) travis-lint...

makandra dev
github.com

Git commands tend to come in groups. Avoid typing git over and over and over by running them in a...

stackoverflow.com

First, decide if you want to pull with rebase. There are some implications of changing this, so think before you...

You can tell git to ignore different kinds and amounts of whitespace when merging or cherry-picking. This often occurs...

makandra dev

When you're using feature branches, they will stack up if you don't delete them after the merge to...

unix.stackexchange.com

As described by the linked Stackoverflow answer, run these commands: sudo add-apt-repository ppa:git-core/ppa -y

makandra dev
stackoverflow.com

When there's a Gemfile.lock in your working directory that you cannot remove by either checkout, reset [--hard], stash, probably...

makandra dev
stackoverflow.com

git rebase -i -> mark your commit with edit git reset HEAD~ (remove the marked commit, but keep its...

This is a guide on how to effectively use Git when working on a feature branch. It is designed to...

makandra Curriculum

makandra's development process Learn about our process. The squares represent the state of the issue in Linear:

makandra dev

tig is a command line explorer for Git that is just awesome. Install via apt-get or brew. Handy commands...

Large projects usually have large test suites that can run for a long time. This can be annoying as running...

makandra Curriculum

Understand the differences between git diff and git diff --staged (or git diff --cached) Understand the difference between git...