[bisq-network/bisq-docs] [WIP] Produce a 'getting started' guide (#45)
notifications at github.com
Thu May 3 19:17:56 UTC 2018
Nice @m52go, this reworked PR looks great. Thanks for taking the time. Just a couple things from a Git perspective. I rebased this branch against `master` such that it now contains only the commits that you and I have have worked on that are specific to this doc, and I force pushed those changes up to this PR branch. See the four commits in the timeline above, and compare with the commits that were in the timeline previously:
Again, these extra commits were just an artifact of creating the PR branch from `master` in the first place. No big deal, it's all clean now.
The other thing is your Git author metadata, which I see is cleaned up now for most commits, but is still off on the original commit c9e77ef. It's not a must that you fix this, but if you'd like to, here's what you can do:
1. `git rebase -i c9e77ef^`
1. in the editor, change `pick` to `edit` for c9e77ef
1. exit the editor
1. run `git show`; notice that commit c9e77ef still has your old author metadata
1. run `git commit --amend --reset-author -C c9e77ef`
1. run `git show` again; notice that your author metadata is fixed
1. run `git rebase --continue`
1. run `git push --force` to force push the changes back up to the PR branch
I mention the above again not because you 'must' do it, but because you seem to have taken well to the ideas of rebasing and squashing so far, and you may find these additional exercises enlightening / empowering for future work.
The reason it's practical to clean this up, by the way is because having consistent author metadata makes tools like `git shortlog` work as expected:
I'm running this against the current HEAD of this PR branch (96f7019):
$ git shortlog -nse
160 Chris Beams <chris at beams.io>
50 Manfred Karrer <mk at nucleo.io>
1 Christoph Atteneder <christoph.atteneder at gmail.com>
1 Francois Carpentier <Francewhoa at users.noreply.github.com>
1 Steve Jain <mfiver at gmail.com>
1 author <sburnitt at gmail.com>
1 csacher <cris.sacher at gmail.com>
1 Bender <31224386+SylarBend at users.noreply.github.com>
1 m52go <mfiver at gmail.com>
1 Bernard Labno <bernard.labno at pjwstk.edu.pl>
Notice how you have two entries, (one for "Steve Jain" and one for "m52go"). This will become one single entry if you follow the steps above.
I'll follow up further with review comments on the substance of the outline as soon as possible. And of course anyone else is welcome to as well. Excited about this!
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the github