travisjupp

Mastering Three-Way Merge with Neovim, Fugitive, and Delta

Table of Contents

1. Introduction
2. Installation
3. Configuration
4. Understanding Three-Way Merge
5. Basic Operations
6. Advanced Usage
7. Real-World Example

travisjupp

Zsh ZLE Standard Widgets — Default Key Bindings (Zsh 5.9) and Bash Readline Equivalents

This list gives all standard widgets (including those with and without default keybindings), a short summary, and the default key(s) for each, as found in Zsh 5.9 (emacs and vi modes).
Where available, the equivalent Bash Readline function and default keybinding are shown as Ctrl-X (Bash Readline).
Widgets with no default keybinding are listed without a key.
Third-party/community/user widgets (e.g. fzf, npm, z4h, bash*) are also listed when requested, but are not present in default zsh.

---

• accept-and-hold

travisjupp

/**
 * Requires node v0.7.7 or greater.
 *
 * To connect: $ curl -sSNT. localhost:8000
 */

var http = require('http')
  , repl = require('repl')
  , buf0 = new Buffer([0])

travisjupp

{% assign ordered_posts = page.parent.children | sort:'published_at' %}

{% for post in ordered_posts %}
{% if post.id == page.id %}
{% assign previous_post_number = forloop.index | minus:1 %}
{% assign next_post_number = forloop.index | plus:1 %}
{% endif %}
{% endfor %}

{% for post in ordered_posts %}

travisjupp

{% if previous_post.id.size > 0 %}
<div class="padtop padbottom">
  <a href="{{ previous_post.url }}" class="submit-button btn btn-primary">Previous post: "{{ previous_post.headline }}"</a>
</div>
{% endif %}

{% if next_post.id.size > 0 %}
<div class="padtop padbottom">
  <a href="{{ next_post.url }}" class="submit-button btn btn-primary">Next: "{{ next_post.headline }}"</a>
</div>

travisjupp

/* Website Assets */
  	$colorHeadlineTxt:	#E5DBBA; /* rgb(229, 219, 186); */
	$colorHeaderBg:		#3A8031; /* rgb(58, 128, 49); */
	$colorHeaderBgAlt:	#3A6531; /* rgb(58, 101, 49) */
	$colorHeadlineTxt-h1:	#ffffff; /* rgb(255, 255, 255); */
	$colorHeadlineTxt-h2: 	#0862a1; /* rgb(8, 98, 161); */
	$colorBtnBlueFl:	#0C99D5; /* rgb(12, 153, 213); */
	$colorBtnBlueSt:	#0973A1; /* rgb(9, 115, 161); */
	$colorBg:		#9CA7A9; /* rgb(156, 167, 169); */
	$colorBodyTxt:		#ffffff; /* rgb(255, 255, 255); */