Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for ping -i #69

Merged
merged 1 commit into from
Mar 15, 2017
Merged

fix for ping -i #69

merged 1 commit into from
Mar 15, 2017

Conversation

gamkiller77
Copy link
Contributor

added iputils to the top level so ping -i works.

for version 1.2.1

(i will update the 1.1 branch next.)

@jsternberg
Copy link
Contributor

Can you do both of these changes in the same commit and then push to the same branch? Should be something like this:

$ git checkout patch-2
$ git cherry-pick patch-3
$ git reset HEAD~1
$ git commit -a --amend
$ git push -f origin patch-2

Replace origin with whatever you have as your remote name for your repository. I'll close the other issue so these two can be merged together.

@jsternberg jsternberg mentioned this pull request Mar 15, 2017
@gamkiller77
Copy link
Contributor Author

When i did tried the commit from my clone on my laptop i got permission problems that why i did the edits on the website.

@jsternberg
Copy link
Contributor

I'll just merge the commits locally then and ensure you're still listed as the author. I think GitHub allows me to push to forks of projects I have commit access to.

added iputils to the top level so ping -i works.
@jsternberg
Copy link
Contributor

@gamkiller77 I don't like to use the force push to other people's forks thing unless I'm given permission. Do I have permission to force push to your fork with those commits merged?

@gamkiller77
Copy link
Contributor Author

@jsternberg yes you may force push.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants