Auto-squashing Git Commits

Posted About 7 years ago by Henning Koch.
robots.thoughtbot.com

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

Geordi hints

Posted Over 7 years ago by Dominik Schöler.
github.com

Reminder of what you can do with Geordi. Note: If you alias Geordi to something short like g, running commands...

Git stash: Working with old entries

Posted Over 7 years ago.

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

How to tackle complex refactorings in big projects

Posted Over 7 years ago.

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

Bundler: Gemfile.lock is corrupt & gems are missing from the DEPENDENCIES section

Posted Over 7 years ago by Henning Koch.

So you're getting this failure when running bundle install on an older project: Your Gemfile.lock is corrupt. The following...

How to fix: Bundler 1.13 breaks parallel_tests

Posted Over 7 years ago by Arne Hartherz.
github.com

When running tests via parallel_tests, you may encounter an error: cannot load such file -- parallel_tests/gherkin/runtime_logger Error creating formatter...

How to monitor Sidekiq: A working example

Posted Over 7 years ago by Thomas Eisenbarth.

In order to have monitoring for Sidekiq (like queue sizes, last run of Sidekiq) your application should have a monitoring...

Nested ActiveRecord transaction pitfalls

Posted Over 7 years ago.
api.rubyonrails.org

When working with custom transactions and use ActiveRecord::Rollback you may encounter unexpected behaviour if you try to roll back...

How to "git diff" with a graphical diff tool

Posted Over 7 years ago.

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

Git: Show commits that have touched specific text in a file

Posted Over 7 years ago by Emanuel.

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

Git: See more context in a diff

Posted Over 7 years ago by Henning Koch.

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

Git error: "badTimezone: invalid author/committer line - bad time zone"

Posted Over 7 years ago by Tobias Kraze.

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

makandra/gemika: Helpers for testing Ruby gems

Posted Over 7 years ago by Henning Koch.
github.com

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

Hack of the day: One-liner to run all changed Cucumber features

Posted Over 7 years ago by Arne Hartherz.

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

How to tidy up your Git mess

Posted Over 7 years ago.
ohshitgit.com

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

Using Spring and parallel_tests in your Rails application

Posted Over 7 years ago by Arne Hartherz.

You want Spring for super-fast binstubs like bin/rails or bin/rspec which avoid Rails boot time. You want parallel_tests...

Git: how to work with submodules

Posted Over 7 years ago by Daniel Straßner.

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

How to fix: "rake db:rollback" does not work

Posted Almost 8 years ago by Arne Hartherz.

When you run rake db:rollback and nothing happens, you are probably missing the latest migration file (or have not...

FreeBSD pkg can't find any packages

Posted Almost 8 years ago by Claus-Theodor Riegg.

If you're trying to searching or installing packages via pkg the your repository data might be broken. If pkg...

Install MySQL 5.6 in Ubuntu 16.04

Posted About 8 years ago by Tobias Kraze.

Instead of using this hack you might want to use MariaDB 10.x which can work with both old and...

Using Bumbler to Reduce Runtime Dependencies - The Lean Software Boutique

Posted About 8 years ago by Henning Koch.
ombulabs.com

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

An interactive Git shell

Posted About 8 years ago by Dominik Schöler.
github.com

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

Ever wanted man pages that actually help? Here you go

Posted About 8 years ago by Dominik Schöler.
explainshell.com

Enter any command into explainshell and it will explain it to you: split into separate commands (if present), with each...

Git: auto-stashing to avoid conflicts on pull

Posted About 8 years ago by Dominik Schöler.
stackoverflow.com

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