KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
I've set up tracking branches with the --track option, and when I do a git pull on master , it fetches all branches to origin/branchname but doesn't merge with the local tracking branches. This is extra annoying, because if I later do a git push on master , it says that non-fast-forward updates were rejected on the tracking branches, since they weren't fast-forwarded on the initial git pull . My question is: How do I make it so that git pull with fetch all branches and automatically fast-forward all the tracking branches? Note: git pull used to fast-forward all my tracking branches with my GitHub repos, but now that I've set up my own repos using Gitolite, this problem is cropping up.
Tags (comma-separated)
Save Edits
Cancel