Set default merge between two branches as a rebase.
Updating git-import-feature to squash commits of a branch and then delete it.
Adding vbif to import a feature into a branch.
Merge branch 'develop'

Conflicts:
	config/zsh/aliases-git.zsh