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

Update build-linux.txt #253

Merged
merged 2 commits into from
Oct 16, 2018
Merged

Update build-linux.txt #253

merged 2 commits into from
Oct 16, 2018

Conversation

drug007
Copy link
Contributor

@drug007 drug007 commented Oct 12, 2018

From memory, inaccuracy possible

doc/howto/build-linux.txt Outdated Show resolved Hide resolved
doc/howto/build-linux.txt Outdated Show resolved Hide resolved
@q4a
Copy link
Member

q4a commented Oct 13, 2018

Thanks. just 1 fix:
After
git clone https://github.com/OpenXRay/xray-16.git --recurse-submodules
We don't need to do:
git submodule update --init --recursive

@drug007
Copy link
Contributor Author

drug007 commented Oct 13, 2018

@q4a I left it just in case, but I wasn't sure it was useful, so it's fixed now.

Offtopic: what about using markdown instead of plain text?

@drug007
Copy link
Contributor Author

drug007 commented Oct 13, 2018

@q4a, @Zegeri, and the others: please do not merge this PR before I rebase it to current head. If you think PR looks good just write LGTM (looks good to me) for example or make other sign.

Frankly we shouldn't merge any PR until it is rebased to the head. This easy rule makes history much more pleasant to work with.

@Xottab-DUTY
Copy link
Member

@drug007 no need for this. There's no conflicts, so the rebase is unnecessary.

@drug007
Copy link
Contributor Author

drug007 commented Oct 13, 2018

@Xottab-DUTY there is big need for this. Our repository history is awful due to this fact. Conflicts aren't the only reason to make rebase.

@drug007
Copy link
Contributor Author

drug007 commented Oct 16, 2018

@Xottab-DUTY up

@q4a q4a merged commit 7d57b8d into OpenXRay:xd_dev Oct 16, 2018
@drug007 drug007 deleted the patch-1 branch October 16, 2018 19:59
@Xottab-DUTY Xottab-DUTY added this to the Linux port milestone Nov 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants