| <?xml version="1.0" encoding="UTF-8"?> | |
| <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> | |
| <!-- | |
| Noto Mono + Color Emoji Font Configuration. | |
| Currently the only Terminal Emulator I'm aware that supports colour fonts is Konsole. | |
| Usage: | |
| 0. Ensure that the Noto fonts are installed on your machine. | |
| 1. Install this file to ~/.config/fontconfig/conf.d/99-noto-mono-color-emoji.conf |
| #!/bin/sh | |
| # URL https://gist.github.com/Raboo/eda65914c4bcb2af2b32 | |
| # add following to sudo | |
| # Cmnd_Alias SMARTCTL = /usr/local/sbin/smartctl | |
| # daemon ALL=(ALL) NOPASSWD: SMARTCTL | |
| # add following to /usr/local/etc/collectd.conf | |
| # LoadPlugin exec |
| #!/usr/bin/python | |
| """\ | |
| A command-line utility that can (re)send all messages in an mbox file | |
| to a specific email address, with options for controlling the rate at | |
| which they are sent, etc. | |
| """ | |
| # I got this script from Robin Dunn a few years ago, see | |
| # https://github.com/wojdyr/fityk/wiki/MigrationToGoogleGroups |
| /* | |
| * I add this to html files generated with pandoc. | |
| */ | |
| html { | |
| font-size: 100%; | |
| overflow-y: scroll; | |
| -webkit-text-size-adjust: 100%; | |
| -ms-text-size-adjust: 100%; | |
| } |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)