Sync¶

git push <remote> <local-branch>

git fetch <repo> <remote-branch>

git merge <repo>/<remote-branch>

git pull <repo> <remote-branch>:<local-branch>

rm -fr .git  #will keep all

git clone https://github.com/usr/repo.git repo_name

git remote add azure https://azure.com/repo-name
git push -u azure --all

git checkout master       #check out fork's local default branch
git fetch upstream        #fetch upstream branches and commits
git merge upstream/master #merge upstream/master into local current branch
git push origin master    #push local changes to origin/master

git checkout my-branch
git stash
git fetch upstream
git rebase upstream/master #rebase my-branch from the upstream’s master branch
git stash

# if the local branch is already in a pr
git push --force-with-lease origin my-branch # don't overwrite remote changes we don't have locally

git checkout my-branch
git fetch origin        #git pull origin master, OK but better use
git merge origin/master

git checkout <local-branch>
git fetch azure
git merge <repo>/<remote-branch> #merge to local checked-out branch

# example
git checkout main
git fetch origin
git merge origin/main

git fetch <repo> <remote-branch>
git checkout -b <local-branch> <repo>/<remote-branch>

# first time add upstream
git push -u azure local-branch
# git push <repo> <local-branch>:<remote-branch>
git push azure local-branch:remote-branch

#check out branch to merge to
git checkout my-branch

#pull the desired branch from the upstream repo
git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git branch-name

#commit the merge

#push merge to GitHub repo
git push origin branch-name

git checkout -b sync-1
git fetch azure
git reset --hard azure/main

git fetch github

# one by one
git cherry-pick <commit-hash-1>
..
git cherry-pick <commit-hash-n>

# or in a range
git cherry-pick <oldest-commit-hash>^..<newest-commit-hash>

git push azure sync-1