| Next | Stop merging master | 22 |
“But git-pull is convenient and simple!”
“I don't want to change my workflow and do separate fetch and merge!”
No worries! The problem is with the merges.
If you do git-pull --rebase it will do fetch + rebase instead of fetch + merge.
To set this up to happen automatically, run this one time:
git config --global --add 'pull.rebase' 'true'
That adds to your `.gitconfig`:
[pull]
rebase = true
| Next | |
Copyright © 2013 M. J. Dominus |