Patches #2002

xonotic-data.pk3dir:Mario/ignore_files: an XS merge request: Adds some compiler files to the ignore list, so they can't be accidental...

Added by git-manager 2 months ago.

Status:NewStart date:06/20/2014
Priority:NormalDue date:
Assignee:-% Done:

0%

Category:-
Target version:-

Description

Adds some compiler files to the ignore list, so they can't be accidentally committed (again).

Repository: xonotic/xonotic-data.pk3dir.git
Commit: b91ad35ce4c93a284fb5747674723f741b93d990
Branch: Mario/ignore_files

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'b91ad35ce4c93a284fb5747674723f741b93d990'..'origin/Mario/ignore_files'

# 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 --edit --log --no-ff 'origin/Mario/ignore_files'

# 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 'Mario/ignore_files'

Diffstat:

 .gitignore |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Revision log:

commit b91ad35ce4c93a284fb5747674723f741b93d990
Author: Mario <mario.mario@y7mail.com>
Commit: Mario <mario.mario@y7mail.com>

    Ignore some compiler files

User agreed to the license.

Diff:

diff --git a/.gitignore b/.gitignore
index 111ff91..a305108 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ qcsrc/menu/fteqcc.log
 qcsrc/server/fteqcc.log
 weapons.qc.tmp
 *.lno
-qcsrc/qccversion.*
+qcsrc/qccversion*
+qcsrc/server/precache-for-csqc.inc

Also available in: Atom PDF