christianmlong + git + pull   5

In what cases could `git pull` be harmful? - Stack Overflow
However, with all versions of Git, I recommend configuring a git up alias like this:

git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'

and using git up instead of git pull. I prefer this alias over git pull --ff-only because:

it works with all (non-ancient) versions of Git,
it fetches all upstream branches (not just the branch you're currently working on), and
it cleans out old origin/* branches that no longer exist upstream.
git  pull  up  alias  config  ff-only  merge 
july 2015 by christianmlong
git pull after forced update - Stack Overflow

You can replay your local commits ontop of any other commit/branch using git rebase

git rebase -i origin/master
git  pull  force  push  rebase 
may 2015 by christianmlong
Syncing a fork · GitHub Help
Sync a fork of a repository to keep it up-to-date with the upstream repository.

git fetch upstream
git checkout master
git merge upstream/master

Then, do
git push origin master

to push the changes up to the online repo.
git  sync  fork  upstream  pull  rebase  merge 
july 2014 by christianmlong

Copy this bookmark: