Luboš Hubáček Sekiphp

## Automatically start ssh-agent on Windows
env=~/.ssh/agent.env

agent_load_env () { test -f "$env" && . "$env" >| /dev/null ; }

agent_start () {
    echo "Starting new SSH agent"

    (umask 077; ssh-agent >| "$env")
    . "$env" >| /dev/null ;
}

## Magento1 _websiteFilter callback on collection
protected function _websiteFilter($collection, $column)
{
    if (!$value = $column->getFilter()->getValue()) {
        return $this;
    }

    $stores = Mage::app()->getWebsite($value)->getStores();
    foreach ($stores as $store) {
        $collection->addStoreFilter($store);
    }

## Git Aliases
git config --global alias.cm 'commit -m'
git config --global alias.st status

## Update forked repository
# check if upstream is configured
git remote -v

git fetch                           # pull ahead commits from remote
git fetch upstream
git merge upstream/branch_name
git push
git log -n 5

## mysql-config
[mysql]
host=
port=
user=
password=
database=

## Rebase multiple commits into one
1. git rebase --interactive HEAD~10
2. pick commit and replace `pick` for "child" commits to `s` (it means squash)
3. save & force push

## Fix changes in submodule (-dirty commits)
cd submodule
git reset --hard HEAD
git clean -fd .
cd ..
git submodule update --init --recursive

## Show git branch name in console
# GIT bash integration
if [[ -e /usr/lib/git-core/git-sh-prompt ]]; then

        source /usr/lib/git-core/git-sh-prompt

        export GIT_PS1_SHOWCOLORHINTS=true
        export GIT_PS1_SHOWDIRTYSTATE=true
        export GIT_PS1_SHOWUNTRACKEDFILES=true
        export GIT_PS1_SHOWUPSTREAM="auto"

## change_git_remotes.sh
#!/bin/bash

clear

prefix=""

ls -d */ | while read -r folder;
do
    cd "$folder"
    echo "Before:"

## Git push without --set-upstream
git config --global push.default current
	env=~/.ssh/agent.env

	agent_load_env () { test -f "$env" && . "$env" >\| /dev/null ; }

	agent_start () {
	echo "Starting new SSH agent"

	(umask 077; ssh-agent >\| "$env")
	. "$env" >\| /dev/null ;
	}
	protected function _websiteFilter($collection, $column)
	{
	if (!$value = $column->getFilter()->getValue()) {
	return $this;
	}

	$stores = Mage::app()->getWebsite($value)->getStores();
	foreach ($stores as $store) {
	$collection->addStoreFilter($store);
	}
	git config --global alias.cm 'commit -m'
	git config --global alias.st status
	# check if upstream is configured
	git remote -v

	git fetch # pull ahead commits from remote
	git fetch upstream
	git merge upstream/branch_name
	git push
	git log -n 5
	1. git rebase --interactive HEAD~10
	2. pick commit and replace `pick` for "child" commits to `s` (it means squash)
	3. save & force push
	cd submodule
	git reset --hard HEAD
	git clean -fd .
	cd ..
	git submodule update --init --recursive
	# GIT bash integration
	if [[ -e /usr/lib/git-core/git-sh-prompt ]]; then

	source /usr/lib/git-core/git-sh-prompt

	export GIT_PS1_SHOWCOLORHINTS=true
	export GIT_PS1_SHOWDIRTYSTATE=true
	export GIT_PS1_SHOWUNTRACKEDFILES=true
	export GIT_PS1_SHOWUPSTREAM="auto"
	#!/bin/bash

	clear

	prefix=""

	ls -d */ \| while read -r folder;
	do
	cd "$folder"
	echo "Before:"