For tmux runtime option.
Merge branch 'trial-git-merge-force-ff' into adopt
Merge branch 'trial-git-graph-semantic-alias' into adopt

Conflicts:
	gitconfig/_gitconfig
Update docs, etc.: Merge branch 'adopt' into trial

Conflicts:
	gitconfig/_gitconfig