search

adtac / climate

The swiss-army knife of utility tools for Linux.
GNU General Public License v3.0
1.43k stars 76 forks source link

Add httpstat support to network #6

Closed leozhang2018 closed 8 years ago

adtac commented 8 years ago

@leozhang2018 I think the merge commit is stil there. Also, instead of a new commit, you can amend https://github.com/adtac/climate/pull/6/commits/457f88beb342c7a7fff7ecdef569965c041ef39c - both these can be achieved through a rebase:

$ git pull --rebase origin master

should pull in the latest repo. Then, do

$ git rebase --interactive HEAD~5

and you'll be presented with the latest 5 commits. You can then change pick to edit for you first commit and make the changes.

Or if you like, you can create a fresh PR from a fresh fork. Sorry if this is taking really long or is annoying, I just want to maintain some level of consistency with the repo.