Last active
April 2, 2019 14:19
-
-
Save mangosmoothie/c9c1f13620324e8435771815451f9d57 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# never use pull https://www.reddit.com/r/programming/comments/6nzgje/psa_use_git_config_global_bool_pullrebase_true_to/ | |
git fetch | |
git log ..@{u} # show me the new goodies | |
# @{u} is git-speak for "the upstream branch I'm currently tracking" | |
# Let's take it | |
git rebase | |
# alternatively | |
git fetch | |
git log ..@{u} # show me the new goodies | |
# Oh, they fixed the bug I'm working on already! | |
git reset --hard @{u} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment