Andrew Tainton atainton

## merging-pull-requests-using-the-command-line.txt
credit to https://github.com/mdkrog

git checkout development
git pull origin development
git checkout your-local-branch
git rebase -i development
git push -f origin your-local-branch
git checkout development
git merge your-local-branch --ff-only
git push origin development

## gist:33d6b35c6b7397b8f5d4
# soft delete
git branch -d -r remote_name/branch_name

# hard delete
git push origin :branchname

## gist:1d76fa788f948104ded5
bundle clean --force

## gist:a30fe28a03867ccbdaff
du -h --max-depth=1 | sort -hr

## gist:c30c2e07a2bb894ec3c9
git branch -D `git branch | grep 'ard_*'`

## gist:60eb22df3299b8e827e9
git log --all --pretty=format:'%h %cd %s (%an)' --since='7 days ago'

git log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short


## gist:4c8787bb44dd2cfb289c
Dump:
mysqldump -u USERNAME -p PASSWORD DBTODUMP > /path/to/DUMPFILE.sql

Import:
mysql -u USERNAME -p PASSWORD DBTOIMPORTTO < /path/to/DUMPFILE.sql/
	credit to https://github.com/mdkrog

	git checkout development
	git pull origin development
	git checkout your-local-branch
	git rebase -i development
	git push -f origin your-local-branch
	git checkout development
	git merge your-local-branch --ff-only
	git push origin development
	# soft delete
	git branch -d -r remote_name/branch_name

	# hard delete
	git push origin :branchname
	git log --all --pretty=format:'%h %cd %s (%an)' --since='7 days ago'

	git log --pretty=format:'%h %ad \| %s%d [%an]' --graph --date=short
	Dump:
	mysqldump -u USERNAME -p PASSWORD DBTODUMP > /path/to/DUMPFILE.sql

	Import:
	mysql -u USERNAME -p PASSWORD DBTOIMPORTTO < /path/to/DUMPFILE.sql/