DomDomHaas

/*
 * This is a collection of Playdate patterns compiled into a header-only library
 * for use in C SDK projects.
 *
 * The pattern definitions listed here are copied directly from Ivan Sergeev's
 * 'gfxp' library, which can be found here: https://github.com/ivansergeev/gfxp
 *
 *
 * USAGE:
 *

andyrbell

# use ImageMagick convert
# the order is important. the density argument applies to input.pdf and resize and rotate to output.pdf
convert -density 90 input.pdf -rotate 0.5 -attenuate 0.2 +noise Multiplicative -colorspace Gray output.pdf

hraban

Moved to https://github.com/nobssoftware/nocommit

mattratleph

vimdiff cheat sheet

##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)