search

Xandaros / evolve

An advanced admin mod for Garry's Mod
50 stars 39 forks source link

Implement an ev_menu toggle command #165

Closed stazio closed 6 years ago

stazio commented 6 years ago

This adds the "ev_menu" command which is a toggle allowing people to easily bind their keys to a single, toggle-able, command.

Xandaros commented 6 years ago

Uhm... I don't think the TTT tab is relevant to this PR

stazio commented 6 years ago

Whhops, I apologize; Git has a steep learning curve. I removed the irrelevant code.

Xandaros commented 6 years ago

Hurray for squash and merge. Here's a tip for the future:

If you want to PR a buried commit, first create a new branch: git checkout -b patch-1 (checkout -b will create a branch and automatically check it out. Alternatively, you can first create it with git branch patch-1 and then switch to it with git checkout patch-1)

Next, reset the branch to upstream: git reset --hard upstream/master, assuming you have a remote named "upstream" for the upstream repo. If you don't, you can create it with git remote add git@github.com:Xandaros/evolve.git Note that any uncommitted changes will be discarded!

Now, cherry-pick the commits you want to add to the PR: git cherry-pick b1ebcc9f17a317a6e6edbe8b72ae0ff5ca024d8f (You don't need to use the whole SHA-1, a couple of characters will suffice, as long as it is unambiguous)

Finally, push the new branch to your own repo (assuming your remote is called "origin"): git push -u origin patch-1. The -u flag will make your local patch-1 branch track the patch-1 branch on the remote. If you later want to add more commits, you can simply git push to push them.

And now make your PR based off of the new branch. To go back to the master branch, you can just use git checkout master.