Open pashamesh opened 9 years ago
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.
I added
-p
option to make server port configurable