mkdir ~/bin
echo 'PATH=~/bin:$PATH' >> ~/.bash_profile
chmod +x ~/bin/ds
<?php | |
namespace App\Http\Controller\Graph; | |
use Doctrine\Common\Annotations\AnnotationReader; | |
use Doctrine\Common\Annotations\Reader; | |
use Doctrine\Common\Collections\Collection; | |
use Doctrine\ORM\Mapping\ManyToMany; | |
use Doctrine\ORM\Mapping\ManyToOne; |
# overwrite master with contents of feature branch (feature > master) | |
git checkout feature # source name | |
git merge -s ours master # target name | |
git checkout master # target name | |
git merge feature # source name |
#!/bin/sh | |
set -e | |
git config -f .gitmodules --get-regexp '^submodule\..*\.path$' | | |
while read path_key path | |
do | |
url_key=$(echo $path_key | sed 's/\.path/.url/') | |
url=$(git config -f .gitmodules --get "$url_key") | |
git submodule add $url $path |