Alt gateway in DHCP#731
Alt gateway in DHCP#731WildRat wants to merge 4 commits intoericpaulbishop:masterfrom WildRat:Alt-gateway-in-DHCP
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? |