Pin base repo commit for consistency

[lucasaafaria]

Issue reference: #20

Description: pins commit peer-observer/peer-observer@87823b7 when cloning peer-observer repo

[m4ycon]

I think there was some mistake here in the update with master, I expect to see these commits: old one -> merge from ClubeBitcoinUnB:master -> something new. Can you fix this? So that git doesn't see these already merged commits as different commits from your branch?

Its quite simple, you can update your repo master (in github interface if you want), then you can undo locally some commits until 2aaf0a9, merge master on your branch and re-commit 178e7d6 + 2adb7ea. And of course, to do this you have to force push as it will change git history here.

[lucasaafaria]

I think there was some mistake here in the update with master, I expect to see these commits: old one -> merge from ClubeBitcoinUnB:master -> something new. Can you fix this? So that git doesn't see these already merged commits as different commits from your branch?

Its quite simple, you can update your repo master (in github interface if you want), then you can undo locally some commits until 2aaf0a9, merge master on your branch and re-commit 178e7d6 + 2adb7ea. And of course, to do this you have to force push as it will change git history here.

Fixed it, thanks. I updated my fork with the upstream, synced master with my branch and commited on top of it, so now history won't be messed up.