20 lines
388 B
Plaintext
20 lines
388 B
Plaintext
git remote add upstream git@github.com:sugarcrm/Mango.git
|
|
git checkout -t -b caramel upstream/caramel
|
|
git checkout -b caramel
|
|
|
|
git fetch upstream
|
|
git checkout caramel
|
|
git merge upstream/caramel
|
|
|
|
git add --all
|
|
git commit -m 'comment'
|
|
git push origin caramel
|
|
|
|
|
|
git push -f origin HEAD^:master // remove last push from remote
|
|
git reset --soft HEAD^
|
|
|
|
git stash
|
|
git stash apply
|
|
git stash drop
|