title: I forked up my commit history?
body: <p>I'm relatively new to git so I'm sure I didn't handle this correctly.</p>
  
  <p>Instead of forking off a repository from Github I just pulled from it and then reset my remote origin to a private repo on my own account. I used new branches to create features or fix some bugs sometimes but not consistently.</p>
  
  <p>This was about a month ago and the changes I made are not wanted in the original repo but there are some changes I want to pull from the master branch.</p>
  
  <p>Having my background details, <strong>how would I go about pulling those changes without screwing up my commit history?</strong> I've read some about merging and rebasing but I really only have practice merging from branches on the same repo locally.</p>