Skip to content

Instantly share code, notes, and snippets.

@havvg

havvg/.gitconfig

Created March 15, 2012 20:44
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save havvg/2046776 to your computer and use it in GitHub Desktop.
Save havvg/2046776 to your computer and use it in GitHub Desktop.
Download ZIP
git up
Raw
.gitconfig
[alias]
up = !git merge --ff-only upstream/`git branch --no-color | grep -e '^\\*' | cut -d\" \" -f2`
@cordoval
Copy link

cordoval: Use git branch --set-upstream and 'git pull' like normal people? he was not right
I finally upgraded to the latest and solved this problem

http://www.craftitonline.com/2012/03/updating-git-to-the-latest-on-ubuntu/

@havvg
Copy link
Author

havvg commented Mar 17, 2012

It's not about pull from the tracking branch, which would be altered by --set-upstream as you mentioned.
It's about having two different remote repositories to merge from.

Like I said, you have your like "central" (Yes, I know git is not centralized.) remote, where your company pushes to and pulls from (called origin). A clean push and pull will interact with that remote and their respective branches. You would track new branches from there - git co -b feature/new-feature --track origin/feature/new-feature which allows simple git push and git pull.

In addition you have the official remote repository called upstream. No one of your company is allowed to push to it, you only update from it. This is what git up does.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment