-
Notifications
You must be signed in to change notification settings - Fork 221
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
Alt gateway in DHCP #731
base: master
Are you sure you want to change the base?
Alt gateway in DHCP #731
Conversation
WildRat
commented
Feb 16, 2018
- Add option to use alternative gateway IP in DHCP
- Change DHCP lease time units from hours to minutes
Make more unified look.
Fix e-mail plugin internalization bug
1) Add option to use alternative gateway IP in DHCP 2) Change DHCP lease time units from hours to minutes
Can you seperate these even further? Each one shouldn’t have the previous changes in it. |
I've noticed that as well. Been there, done that. What's the best approach here? Rebase? Then maybe a forced push (since there's no downstream activity on this one)? |
Assuming the branch is clean, reset to before these changes and create 4 new branches. You can branch from a point in time via github.com as well by “browse repository at this commit”, then attempt to create branch as usual and it will branch at that point |
You don't need to rebase. Checkout the commit before the proposed changes and create a new branch. Then use the git cherry-pick command to add the commits you want to the new branch. Merge in the my master branch to make sure it will merge ok, and then send a pull request for that branch. I'll add that your proposed changes other than the alt DHCP gateway look good, and I'll merge the pull request with those. I need to take a closer look at the alt DHCP gateway proposal before I decide on that one. |
Whats the status of this PR? |