Personally, I would do as tuna_fish suggested; it's neat.
However, since you want to do this with integration, I will point out that as git pull documentation says, a git pull is just a git fetch , followed by git merge . Thus, you can use these two functions in series.
source share