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

Server port option #6

Open
wants to merge 11 commits into
base: master
Choose a base branch
from

Conversation

pashamesh
Copy link
Contributor

I added -p option to make server port configurable

@@ -2,4 +2,4 @@

PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'

ldconfig
ldconfig
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer files to all end in a newline. I cleaned this up when I applied your patches for creating deb packages -- why did this change again in this patch series?

@mkrufky
Copy link
Owner

mkrufky commented Aug 13, 2015

This can all be folded into a single patch, but it should at least be rebased against master before any merge.

Please resend this PR after a clean rebase against the target branch.

For instance, from the commandline:

git checkout server_port_option
git pull --rebase https://github.com/mkrufky/libdvbtee.git
git push --force origin server_port_option

... or you can fold the changes into one pretty easily like so:

git remote add mkrufky https://github.com/mkrufky/libdvbtee.git
git diff mkrufky/master server_port_option > server_port_option.patch
git checkout mkrufky/master -b new_server_port_option
patch -p1 < server_port_option.patch
git commit -a -m "dvbtee: added -p option to make server port configurable"
git push origin new_server_port_option

note: only use the --force option when you're 100% sure of what you're doing. If you want to avoid the --force option, then just pick a new name for your target branch.

@mkrufky mkrufky force-pushed the master branch 2 times, most recently from 09a1346 to 655afcf Compare November 1, 2015 14:27
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.

2 participants