Jordan Heale pridit

This is way more complicated than it should be. The following conditions need to be met :

need to be able to track and merge in upstream changes
don't want remote commit messages in master
only interested in sub-directory of another repo
needs to go in a subdirectory in my repo.

In this particular case, I'm interested in bringing in the 'default' template of jsdoc as a sub-directory in my project so I could potentially make changes to the markup it genereates while also being able to update from upstream if there are changes. Ideally their template should be a separate repo added to jsdoc via a submodule -- this way I could fork it and things would be much easier.... but, it is what it is.

After much struggling with git, subtree and git-subtree, I ended up finding this http://archive.h2ik.co/2011/03/having-fun-with-git-subtree/ -- it basically sets up separate branches from tracking remote, the particular sub-directory, and uses git subtree contrib module to pull it all togther. Following are

Routing plex traffic through an SSH tunnel

This guide creates a reverse SSH tunnel to route all Plex server traffic through it.

Step 2 is done on the tunnel, all other steps are done on the plex server.

1. Setup SSH keys (if you already have key based authenthication setup skip to step 2)

On plex server:

How to add a collapsible section in markdown

1. Example

Click me

Heading

Foo
Bar
- Baz

Qux

Conventional Commit Messages

See how a minor change to your commit message style can make a difference.

Tip

Take a look at git-conventional-commits , a CLI util to ensure these conventions, determine version and generate changelogs

	-- Remove the history from
	rm -rf .git

	-- recreate the repos from the current content only
	git init
	git add .
	git commit -m "Initial commit"

	-- push to the github remote repos ensuring you overwrite history
	git remote add origin [email protected]:<YOUR ACCOUNT>/<YOUR REPOS>.git

	using System.Diagnostics;

	namespace ac4bfmp_launcher
	{
	class Program
	{
	static void Main(string[] args)
	{
	var p = new ProcessStartInfo(@"path\to\Ubisoft Game Launcher\UbisoftGameLauncher.exe", "-upc_uplay_id 437 -upc_game_version 0 -upc_exe_path [path_to_exe_base64_encoded] -upc_working_directory [working_directory_base64_encoded] -uplay_steam_mode");
	// for example, my AC4BFMP.exe is located at D:\games\Steam\steamapps\common\Assassin's Creed IV Black Flag\AC4BFMP.exe,

	prop_a4_pile_01
	prop_a4_sheet_01
	prop_a4_sheet_02
	prop_a4_sheet_03
	prop_a4_sheet_04
	prop_a4_sheet_05
	prop_abat_roller_static
	prop_abat_slide
	prop_acc_guitar_01
	prop_acc_guitar_01_d1

	# Backup
	docker exec CONTAINER /usr/bin/mysqldump -u root --password=root DATABASE > backup.sql

	# Restore
	cat backup.sql \| docker exec -i CONTAINER /usr/bin/mysql -u root --password=root DATABASE