37 lines
627 B
Bash
37 lines
627 B
Bash
git config --global user.email "d-popov@abv.bg"
|
|
git config --global user.name "Dobromir Popov"
|
|
|
|
|
|
#store credentals in file
|
|
git config --global credential.helper store --file
|
|
|
|
git config credential.helper store --file
|
|
|
|
#add upstream (when forked)
|
|
git remote add upstream https://github.com/petals-infra/health.petals.dev.git
|
|
|
|
|
|
# merge upstream
|
|
git fetch upstream
|
|
git checkout main
|
|
git merge upstream/main --allow-unrelated-histories
|
|
git commit -m "Merged upstream/main"
|
|
|
|
# remove upstream
|
|
git remote remove upstream
|
|
git remote -v
|
|
|
|
|
|
|
|
#
|
|
http://192.168.1.36:9000
|
|
|
|
Name: localhost
|
|
Environment address: 192.168.1.36:9001
|
|
|
|
|
|
|
|
|
|
|
|
|