Merge in xonotic/xonotic-data.pk3dir.git: matthiaskrgr/cmd_exit_ask_quit

git-manager created issue #1656 (closed) on 2013-06-09T20:43:19Z:

Purpose of the branch:

When we run "exit" in the command line, ask the player if they wanted to run 'quit' instead.


I think I might not be the only one who tried "exit" a couple of times... *whistle*

Repository: xonotic/xonotic-data.pk3dir.git Commit: ab59400f6b4b5e497e9dcd062ca0968e073af9ce Branch: matthiaskrgr/cmd_exit_ask_quit

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'ab59400f6b4b5e497e9dcd062ca0968e073af9ce'..'origin/matthiaskrgr/cmd_exit_ask_quit'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/matthiaskrgr/cmd_exit_ask_quit'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'matthiaskrgr/cmd_exit_ask_quit'

Diffstat:

 commands.cfg |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Revision log:

commit ab59400f6b4b5e497e9dcd062ca0968e073af9ce
Author: Matthias Krüger 
Commit: Matthias Krüger 

    When we run "exit" in the command line, ask the player if they wanted to run 'quit' instead.

User agreed to the GPLv2*. Diff: <pre>diff —git a/commands.cfg b/commands.cfg index 20f8b6b..6f83467 100644 — a/commands.cfg **+ b/commands.cfg @ -123,6 +123,7 @ alias hud “qc_cmd_cl hud ${* ?}” // Comman alias localprint “qc_cmd_cl localprint ${* ?}” // Create your own centerprint sent to yourself //alias mv_download “qc_cmd_cl mv_download ${* ?}” // Retrieve mapshot picture from the server alias sendcvar “qc_cmd_cl sendcvar ${* ?}” // Send a cvar to the server *alias exit “echo Did you mean ‘quit’?”

// other aliases for local commands alias hud_configure “qc_cmd_cl hud configure”