Felix Wolff flxw

OIR-Rule of giving feedback

Step 1: Observation

neutral
generally a statement of fact

Example

This method has 100 lines.

Example Git Branching Diagram

You can use this diagram as a template to create your own git branching diagrams. Here's how:

Create a new diagram with diagrams.net (formerly draw.io)
Go to File > Open From > URL
Insert this url (it points to the xml data below): https://gist.githubusercontent.com/bryanbraun/8c93e154a93a08794291df1fcdce6918/raw/bf563eb36c3623bb9e7e1faae349c5da802f9fed/template-data.xml
Customize as needed for your team.

Semantic Commit Messages

See how a minor change to your commit message style can make you a better programmer.

Format: <type>(<scope>): <subject>

<scope> is optional

Example

Push branch from one remote into another

Add remote2 as a remote

$ git remote -v
remote2 [email protected]:repo2.git (fetch)
remote2 [email protected]:repo2.git (push)
origin  [email protected]:repo.git (fetch)
origin  [email protected]:repo.git (push)

	# migrating from https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/git/git.plugin.zsh

	# Aliases
	alias g='git'
	#compdef g=git
	alias gst='git status'
	#compdef _git gst=git-status
	alias gd='git diff'
	#compdef _git gd=git-diff
	alias gdc='git diff --cached'

	# http part, may want to move that to nginx.conf, but will work here also
	fastcgi_cache_path /var/lib/nginx/fastcgi/ levels=1:2 keys_zone=kolab3.example.net:16m max_size=256m inactive=1d;
	fastcgi_temp_path /var/lib/nginx/fastcgi/temp 1 2;
	fastcgi_cache_key "$scheme$request_method$host$request_uri";
	fastcgi_cache_use_stale error timeout invalid_header http_500;

	server {
	listen 80;
	server_name kolab3.example.net;
	rewrite ^ https://$server_name$request_uri permanent; # enforce https