wechain · August 10, 2018 14:30
diff --git a/00_instructions.md b/00_instructions.md
diff --git a/my_gitconfig b/my_gitconfig
 [apply]
    whitespace = fix
 [color]
 	# Use colors in Git commands that are capable of colored output when outputting to the terminal
 	ui = auto
 [color "branch"]
 	current = yellow reverse
 	local = yellow
 	remote = green
 [color "diff"]
 	meta = yellow bold
 	frag = magenta bold
 	old = red bold
 	new = green bold
 	whitespace = white reverse
 [color "status"]
 	added = yellow
 	changed = green
 	untracked = cyan
 	branch = magenta
 	
 [url "git://github.com/"]
    insteadOf = "github:"
 [url "[email protected]:"]
    insteadOf = "gh:"
    pushInsteadOf = "github:"
    pushInsteadOf = "git://github.com/"
 [url "[email protected]:germanny/"]
    insteadOf = "germanny:"
    
 [push]
 	default = matching
 
 [merge]
 	# Include summaries of merged commits in newly created merge commit messages
 	log = true
 
 [mergetool]
 	keepBackup = true
 
 [mergetool "diffmerge"]
 	cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"
 	trustExitCode = true
 
 [diff]
 	tool = diffmerge
 
 [difftool "diffmerge"]
 	cmd = diffmerge $LOCAL $REMOTE
 	
 [core]
    excludesfile = ~/.gitignore_global
    editor = /usr/bin/sublimetext
    
 [alias]
    ; show merge tree + commits info
    graph = log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short
    lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
    ; basic logging for quick browsing
    ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate
    ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat
    ; log + file diff
    fl = log -u
    ; find paths that matches the string
    f = "!git ls-files | grep -i"
    ; delete all merged branches
    ; dm = !git branch --merged | grep -v "\*" | xargs -n 1 git branch -d
    ; shortcuts
    cp = cherry-pick
    st = status -s
    cl = clone
    ci = commit
    co = checkout
    br = branch
    dc = diff --cached
diff --git a/os_x_app_list.md b/os_x_app_list.md
diff --git a/phpcs.sublime-settings.md b/phpcs.sublime-settings.md
diff --git a/ST_Package_Control_Settings.md b/ST_Package_Control_Settings.md
diff --git a/ST_User_Preferences.md b/ST_User_Preferences.md
diff --git a/SublimeLinter.sublime-settings b/SublimeLinter.sublime-settings
 ```
 {
 	"user":
 	{
 		"@disable": true,
 		"debug": true,
 		"delay": 0.25,
 		"error_color": "D02000",
 		"gutter_theme": "Packages/SublimeLinter/gutter-themes/Default/Default.gutter-theme",
 		"gutter_theme_excludes":
 		[
 		],
 		"lint_mode": "save only",
 		"linters":
 		{
 			"jshint":
 			{
 				"@disable": false,
 				"args":
 				[
 				],
 				"excludes":
 				[
 				]
 			},
 			"phpcs":
 			{
 				"@disable": false,
 				"args":
 				[
 				],
 				"excludes":
 				[
 				],
 				"standard": "PSR2"
 			},
 			"sass":
 			{
 				"@disable": false,
 				"args":
 				[
 				],
 				"excludes":
 				[
 				]
 			}
 		},
 		"mark_style": "outline",
 		"no_column_highlights_line": false,
 		"passive_warnings": false,
 		"paths":
 		{
 			"linux":
 			[
 			],
 			"osx":
 			[
 			],
 			"windows":
 			[
 			]
 		},
 		"python_paths":
 		{
 			"linux":
 			[
 			],
 			"osx":
 			[
 			],
 			"windows":
 			[
 			]
 		},
 		"rc_search_limit": 3,
 		"shell_timeout": 10,
 		"show_errors_on_save": false,
 		"show_marks_in_minimap": true,
 		"syntax_map":
 		{
 			"html (django)": "html",
 			"html (rails)": "html",
 			"html 5": "html",
 			"javascript (babel)": "javascript",
 			"magicpython": "python",
 			"php": "html",
 			"python django": "python",
 			"pythonimproved": "python"
 		},
 		"tooltip_fontsize": "1rem",
 		"tooltip_theme": "Packages/SublimeLinter/tooltip-themes/Inline/Inline.tooltip-theme",
 		"tooltip_theme_excludes":
 		[
 		],
 		"tooltips": true,
 		"warning_color": "DDB700",
 		"wrap_find": true
 	}
 }
 ```
	[apply]
	whitespace = fix
	[color]
	# Use colors in Git commands that are capable of colored output when outputting to the terminal
	ui = auto
	[color "branch"]
	current = yellow reverse
	local = yellow
	remote = green
	[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold
	whitespace = white reverse
	[color "status"]
	added = yellow
	changed = green
	untracked = cyan
	branch = magenta

	[url "git://github.com/"]
	insteadOf = "github:"
	[url "[email protected]:"]
	insteadOf = "gh:"
	pushInsteadOf = "github:"
	pushInsteadOf = "git://github.com/"
	[url "[email protected]:germanny/"]
	insteadOf = "germanny:"

	[push]
	default = matching

	[merge]
	# Include summaries of merged commits in newly created merge commit messages
	log = true

	[mergetool]
	keepBackup = true

	[mergetool "diffmerge"]
	cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"
	trustExitCode = true

	[diff]
	tool = diffmerge

	[difftool "diffmerge"]
	cmd = diffmerge $LOCAL $REMOTE

	[core]
	excludesfile = ~/.gitignore_global
	editor = /usr/bin/sublimetext

	[alias]
	; show merge tree + commits info
	graph = log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short
	lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
	; basic logging for quick browsing
	ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate
	ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cgreen\\ [%cn]" --decorate --numstat
	; log + file diff
	fl = log -u
	; find paths that matches the string
	f = "!git ls-files \| grep -i"
	; delete all merged branches
	; dm = !git branch --merged \| grep -v "\*" \| xargs -n 1 git branch -d
	; shortcuts
	cp = cherry-pick
	st = status -s
	cl = clone
	ci = commit
	co = checkout
	br = branch
	dc = diff --cached
	```
	{
	"user":
	{
	"@disable": true,
	"debug": true,
	"delay": 0.25,
	"error_color": "D02000",
	"gutter_theme": "Packages/SublimeLinter/gutter-themes/Default/Default.gutter-theme",
	"gutter_theme_excludes":
	[
	],
	"lint_mode": "save only",
	"linters":
	{
	"jshint":
	{
	"@disable": false,
	"args":
	[
	],
	"excludes":
	[
	]
	},
	"phpcs":
	{
	"@disable": false,
	"args":
	[
	],
	"excludes":
	[
	],
	"standard": "PSR2"
	},
	"sass":
	{
	"@disable": false,
	"args":
	[
	],
	"excludes":
	[
	]
	}
	},
	"mark_style": "outline",
	"no_column_highlights_line": false,
	"passive_warnings": false,
	"paths":
	{
	"linux":
	[
	],
	"osx":
	[
	],
	"windows":
	[
	]
	},
	"python_paths":
	{
	"linux":
	[
	],
	"osx":
	[
	],
	"windows":
	[
	]
	},
	"rc_search_limit": 3,
	"shell_timeout": 10,
	"show_errors_on_save": false,
	"show_marks_in_minimap": true,
	"syntax_map":
	{
	"html (django)": "html",
	"html (rails)": "html",
	"html 5": "html",
	"javascript (babel)": "javascript",
	"magicpython": "python",
	"php": "html",
	"python django": "python",
	"pythonimproved": "python"
	},
	"tooltip_fontsize": "1rem",
	"tooltip_theme": "Packages/SublimeLinter/tooltip-themes/Inline/Inline.tooltip-theme",
	"tooltip_theme_excludes":
	[
	],
	"tooltips": true,
	"warning_color": "DDB700",
	"wrap_find": true
	}
	}
	```