Bloerg
         

Although I am a Vim user for almost ten years now, I still learn something new every once in a while that will improve my editing to be more efficient or comfortable. This time – and I have to admit that it’s almost embarrassing – I quickly grew accustomed to the f and t motions. In essence you type f or t followed by a character to which the cursor will jump on or right before. Typing ; and , repeats the motion forward and backward. Before this enlightenment, I was trodding through long lines by repeating w and e motions until I reached my final destination.

There are two reasons why I missed these character-based motions for so long. First of all f and t can only reach targets on the current line whereas programming tasks often involve line and word crossings. Second of all, the non-existant visualization of the motion destinations make it really hard for me to make sense of these motions.

The very handy vim-sneak plugin alleviates both of these problems with the additional benefit of allowing two-character search motions using the s and S keys thus covering middle ground between f motions and full-blown / searches. To skip unused targets, vim-sneak provides the streak mode similar to vim-easymotion that allows to reach a target by typing a third character.

2015-08-13/comparison.png
Difference between standard sneak (top) and streak (bottom) mode.

In the given example I was searching for “mo” starting on the first character on line 6. Streak provides shortcuts a and s to avoid having to type ; two or three times. To enable the streak mode, you have to add the following to your .vimrc:

let g:sneak#streak = 1

By default, vim-sneak does not interfere with f and t motions thus to benefit from highlighting and multi-line f and t motions you have to map the corresponding keys:

nmap f <Plug>Sneak_f
nmap F <Plug>Sneak_F
nmap t <Plug>Sneak_t
nmap T <Plug>Sneak_T

By the way, I link the target colors to type and function syntax colors as follows to get rid of the pesky default pink:

hi link SneakPluginTarget Type
hi link SneakPluginScope Function
hi link SneakStreakTarget Type
hi link SneakStreakMask Function

Lately, a post on writing good Git commit messages and the subsequent Reddit discussion caught my attention. I fully agree with each and every point made and in fact alway try to convince colleagues and friends to follow this model. However, what to do if you are happily coding away, churning out commit after commit and then end up with a larger number of commits with summaries such as “Fixes this” or “Forgot to add that”? You use an interactive rebase, a Git feature that is surprisingly unknown among my fellow peers.

As the name suggests, an interactive rebase is a rebase done in a more intuitive way. That does not sound like a lot because most people assume a rebase to be taking commits from one branch and putting them on top of a commit of another branch. However, with the default workflow an interactive rebase happens on the same branch. To initiate such a rebase, simply find a suitable range of commits that you want to remove, edit or combine (e.g. from HEAD down the last ten commits) and type

$ git rebase -i HEAD~10

Your favorite editor will then be opened with the list of commits in chronological order. You can remove commits simply by removing the corresponding line or reordering commits by moving lines up and down. Concerning the Git commit messages, you can edit a message by replacing pick with reword (short r) or edit (short e) which also gives you the opportunity to change the author of a commit. To combine commits, you can either use squash (short s) which creates a single commit out of all the marked commits and the one commit leading to the first squash commit. fixup does the same but will use the commit message of the previous commit. These tools help to consolidate related commits to one logical commit.

Interactive rebase is a pleasant way of reorganizing the private history. In case you are using Vim, this can be an even more pleasing experience with a small plugin that I wrote some time ago.

To fetch a pull requests by its ID, I probably googled “github checkout pull request” a hundred times by now. Here is a simple Git alias which goes into the .gitconfig to make that a bit easier:

[alias]
  checkout-pr = "!f() { git fetch origin pull/$1/head:pr-$1 && git checkout pr-$1; }; f"

Now it’s just a matter of git checkout-pr 42 to check the changes of pull request #42 on my local system.

Quick reminder how to use the alternatives system to call Neovim:

sudo update-alternatives --install /usr/bin/vi vi /usr/local/bin/nvim
sudo update-alternatives --install /usr/bin/vim vim /usr/local/bin/nvim
sudo update-alternatives --install /usr/bin/editor editor /usr/local/bin/nvim

… and to change it

sudo update-alternatives --config vi