...
[10:43:15 CST(-0600)] <EricDalquist> then rebase your local branch on top of the remote branch by doing "git rebase origin/rel-4-0-patches"
[10:43:54 CST(-0600)] <EricDalquist> that says "replay the commits on my local branch on top of origin/rel-4-0-patches"
[10:44:14 CST(-0600)] <EricDalquist> and it would update the local rel-4-0-patches pointer to the end of that branch
[10:44:30 CST(-0600)] <drewwills> wouldn't "git pull orign" do everything "git fetch origin" would?
[10:44:39 CST(-0600)] <EricDalquist> pull does a fetch and a merge
[10:44:43 CST(-0600)] <EricDalquist> you don't want that merge to happen
[10:44:44 CST(-0600)] <drewwills> yeah