Ilya Shaplyko Shaglock

Git Alias and Git Rebase

Make sure you have configured git tools: see configuring tools.

Make sure you have updated git aliases: see how to register aliases.

WHEN TO DO REBASE

After each commit in our branch, in order to be up-to-date with the integration branch.

How to recover a dropped stash in Git?

1. Find the stash commits:

git log --graph --oneline --decorate ( git fsck --no-reflog | awk '/dangling commit/ {print $3}' )

This will show you all the commits at the tips of your commit graph which are no longer referenced from any branch or tag – every lost commit, including every stash commit you’ve ever created, will be somewhere in that graph.

	require 'net/ssh/gateway'
	require 'active_record'

	# there is no password here as the local user `user` has an SSH key stored on the remote server
	gateway = Net::SSH::Gateway.new('domain.tld', 'user')
	port = gateway.open('127.0.0.1', 3306, 3307)

	ActiveRecord::Base.establish_connection(
	adapter: 'mysql2',
	host: '127.0.0.1',

	#clone ostis
	git clone https://github.com/ShunkevichDV/ostis.git
	cd ostis/scripts
	./prepare.sh
	#clone component
	cd ..
	git clone https://github.com/MikhailSadovsky/ostis-UI-component-sample.git
	#integrate component
	mv ostis-UI-component-sample/example.component/ ./
	mv ostis-UI-component-sample/example_code.scs kb/

	/([^:]\|^):(\w+)\s?(\s)=>\s?(\s)/g,
	"$1$2: $3$4"