git pull Eluna master

Welcome to Git (version 1.8.4-preview20130916)


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.
sh.exe": /c/Users/Administrator/gitaliases/gitaliases.sh: No such fil
ory

Administrator@WIN-NDKT0FRJP7R ~/Desktop/TrinityCore (master)
$ git remote add Eluna https://github.com/ElunaLuaEngine/ElunaTrinity

Administrator@WIN-NDKT0FRJP7R ~/Desktop/TrinityCore (master)
$ git pull Eluna master
remote: Counting objects: 660, done.
remote: Compressing objects: 100% (356/356), done.
remote: Total 660 (delta 362), reused 548 (delta 302)R
Receiving objects: 100% (660/660), 1.22 MiB | 579.00 KiB/s, done.
Resolving deltas: 100% (362/362), done.
From https://github.com/ElunaLuaEngine/ElunaTrinityCata
 * branch            master     -> FETCH_HEAD
 * [new branch]      master     -> Eluna/master
error: Your local changes to the following files would be overwritten
        dep/CMakeLists.txt
        dep/PackageList.txt
        src/CMakeLists.txt
        src/server/collision/Maps/TileAssembler.cpp
        src/server/game/AI/CoreAI/TotemAI.cpp
        src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
        src/server/game/AI/ScriptedAI/ScriptedCreature.h
        src/server/game/AI/SmartScripts/SmartScript.cpp
        src/server/game/AI/SmartScripts/SmartScriptMgr.h
        src/server/game/Achievements/AchievementMgr.cpp
        src/server/game/Achievements/AchievementMgr.h
        src/server/game/AuctionHouse/AuctionHouseMgr.cpp
        src/server/game/AuctionHouse/AuctionHouseMgr.h
        src/server/game/Battlefield/Battlefield.cpp
        src/server/game/Battlefield/Battlefield.h
        src/server/game/Battlefield/BattlefieldMgr.cpp
        src/server/game/Battlefield/BattlefieldMgr.h
        src/server/game/Battlefield/Zones/BattlefieldWG.h
        src/server/game/Battlegrounds/ArenaTeam.cpp
        src/server/game/Battlegrounds/ArenaTeam.h
        src/server/game/Battlegrounds/ArenaTeamMgr.cpp
        src/server/game/Battlegrounds/ArenaTeamMgr.h
        src/server/game/Battlegrounds/Battleground.cpp
        src/server/game/Battlegrounds/Battleground.h
        src/server/game/Battlegrounds/BattlegroundMgr.cpp
        src/server/game/Battlegrounds/BattlegroundMgr.h
        src/server/game/Battlegrounds/BattlegroundQueue.cpp
        src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
        src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
        src/server/game/CMakeLists.txt
        src/server/game/Calendar/CalendarMgr.cpp
        src/server/game/Calendar/CalendarMgr.h
        src/server/game/Chat/Channels/ChannelMgr.cpp
        src/server/game/Chat/Chat.cpp
        src/server/game/Chat/Chat.h
        src/server/game/Chat/ChatLink.cpp
        src/server/game/Chat/ChatLink.h
        src/server/game/Conditions/ConditionMgr.cpp
        src/server/game/Conditions/ConditionMgr.h
        src/server/game/DataStores/DBCEnums.h
        src/server/game/DataStores/DBCStores.cpp
        src/server/game/DataStores/DBCStores.h
        src/server/game/DataStores/DBCStructure.h
        src/server/game/DataStores/DBCfmt.h
        src/server/game/DungeonFinding/LFG.h
        src/server/game/DungeonFinding/LFGMgr.cpp
        src/server/game/DungeonFinding/LFGMgr.h
        src/server/game/DungeonFinding/LFGQueue.cpp
        src/server/game/DungeonFinding/LFGQueue.h
        src/server/game/DungeonFinding/LFGScripts.cpp
        src/server/game/Entities/Corpse/Corpse.cpp
        src/server/game/Entities/Creature/Creature.cpp
        src/server/game/Entities/Creature/Creature.h
        src/server/game/Entities/Creature/GossipDef.cpp
        src/server/game/Entities/Creature/GossipDef.h
        src/server/game/Entities/Creature/TemporarySummon.cpp
        src/server/game/Entities/DynamicObject/DynamicObject.cpp
        src/server/game/Entities/DynamicObject/DynamicObject.h
        src/server/game/Entities/GameObject/GameObject.cpp
        src/server/game/Entities/GameObject/GameObject.h
        src/server/game/Entities/Item/Item.cpp
        src/server/game/Entities/Item/Item.h
        src/server/game/Entities/Item/ItemPrototype.h
        src/server/game/Entities/Object/Object.cpp
        src/server/game/Entities/Object/Object.h
        src/server/game/Entities/Object/ObjectDefines.h
        src/server/game/Entities/Object/Updates/UpdateData.cpp
        src/server/game/Entities/Object/Updates/UpdateData.h
        src/server/game/Entities/Object/Updates/UpdateFieldFlags.cpp
        src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
        src/server/game/Entities/Object/Updates/UpdateFields.h
        src/server/game/Entities/Pet/Pet.cpp
        src/server/game/Entities/Pet/Pet.h
        src/server/game/Entities/Player/Player.cpp
        src/server/game/Entities/Player/Player.h
        src/server/game/Entities/Player/SocialMgr.cpp
        src/server/game/Entities/Totem/Totem.cpp
        src/server/game/Entities/Totem/Totem.h
        src/server/game/Entities/Transport/Transport.cpp
        src/server/game/Entities/Unit/StatSystem.cpp
        src/server/game/Entities/Unit/Unit.cpp
        src/server/game/Entities/Unit/Unit.h
        src/server/game/Entities/Vehicle/Vehicle.cpp
        src/server/game/Entities/Vehicle/VehicleDefines.h
        src/server/game/Events/GameEventMgr.cpp
        src/server/game/Events/GameEventMgr.h
        src/server/game/Globals/ObjectAccessor.cpp
        src/server/game/Globals/ObjectAccessor.h
        src/server/game/Globals/ObjectMgr.cpp
        src/server/game/Globals/ObjectMgr.h
        src/server/game/Gr
error: The following untracked working tree files would be overwritte

        dep/StormLib/CMakeLists.txt
        dep/StormLib/doc/History.txt
        dep/StormLib/doc/Sector Offset MD5.txt
        dep/StormLib/doc/The MoPaQ File Format 0.9.txt
        dep/StormLib/doc/The MoPaQ File Format 1.0.txt
        dep/StormLib/doc/d3-authenticationcode-deDE.txt
        dep/StormLib/doc/d3-authenticationcode-enGB.txt
        dep/StormLib/doc/d3-authenticationcode-enSG.txt
        dep/StormLib/doc/d3-authenticationcode-enUS.txt
        dep/StormLib/doc/d3-authenticationcode-esES.txt
        dep/StormLib/doc/d3-authenticationcode-esMX.txt
        dep/StormLib/doc/d3-authenticationcode-frFR.txt
        dep/StormLib/doc/d3-authenticationcode-itIT.txt
        dep/StormLib/doc/d3-authenticationcode-koKR.txt
        dep/StormLib/doc/d3-authenticationcode-plPL.txt
        dep/StormLib/doc/d3-authenticationcode-ptBR.txt
        dep/StormLib/doc/d3-authenticationcode-zhTW.txt
        dep/StormLib/doc/diablo3_ruru_disk_encrypted_win.blob
        dep/StormLib/doc/diablo3_urls.txt
        dep/StormLib/src/FileStream.cpp
        dep/StormLib/src/FileStream.h
        dep/StormLib/src/SBaseCommon.cpp
        dep/StormLib/src/SBaseDumpData.cpp
        dep/StormLib/src/SBaseFileTable.cpp
        dep/StormLib/src/SCompression.cpp
        dep/StormLib/src/SFileAddFile.cpp
        dep/StormLib/src/SFileAttributes.cpp
        dep/StormLib/src/SFileCompactArchive.cpp
        dep/StormLib/src/SFileCreateArchive.cpp
        dep/StormLib/src/SFileExtractFile.cpp
        dep/StormLib/src/SFileFindFile.cpp
        dep/StormLib/src/SFileListFile.cpp
        dep/StormLib/src/SFileOpenArchive.cpp
        dep/StormLib/src/SFileOpenFileEx.cpp
        dep/StormLib/src/SFilePatchArchives.cpp
        dep/StormLib/src/SFileReadFile.cpp
        dep/StormLib/src/SFileVerify.cpp
        dep/StormLib/src/StormCommon.h
        dep/StormLib/src/StormLib.h
        dep/StormLib/src/StormPort.h
        dep/StormLib/src/adpcm/adpcm.cpp
        dep/StormLib/src/adpcm/adpcm.h
        dep/StormLib/src/bzip2/blocksort.c
        dep/StormLib/src/bzip2/bzlib.c
        dep/StormLib/src/bzip2/bzlib.h
        dep/StormLib/src/bzip2/bzlib_private.h
        dep/StormLib/src/bzip2/compress.c
        dep/StormLib/src/bzip2/crctable.c
        dep/StormLib/src/bzip2/decompress.c
        dep/StormLib/src/bzip2/huffman.c
        dep/StormLib/src/bzip2/randtable.c
        dep/StormLib/src/huffman/huff.cpp
        dep/StormLib/src/huffman/huff.h
        dep/StormLib/src/huffman/huff_patch.cpp
        dep/StormLib/src/huffman/huff_patch.h
        dep/StormLib/src/jenkins/lookup.h
        dep/StormLib/src/jenkins/lookup3.c
        dep/StormLib/src/libtomcrypt/src/hashes/hash_memory.c
        dep/StormLib/src/libtomcrypt/src/hashes/md5.c
        dep/StormLib/src/libtomcrypt/src/hashes/sha1.c
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_argchk.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_cfg.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_cipher.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_custom.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_hash.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_mac.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_macros.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_math.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_misc.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_pk.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_pkcs.h
        dep/StormLib/src/libtomcrypt/src/headers/tomcrypt_prng.h
        dep/StormLib/src/libtomcrypt/src/math/ltm_desc.c
        dep/StormLib/src/libtomcrypt/src/math/multi.c
        dep/StormLib/src/libtomcrypt/src/math/rand_prime.c
        dep/StormLib/src/libtomcrypt/src/misc/base64_decode.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_argchk.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_find_hash.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_find_prng.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_hash_descriptor.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_hash_is_valid.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_libc.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor
        dep/StormLib/src/libtomcrypt/src/misc/crypt_prng_descriptor.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_prng_is_valid.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_register_hash.c
        dep/StormLib/src/libtomcrypt/src/misc/crypt_register_prng.c
        dep/StormLib/src/libtomcrypt/sr
Aborting

Administrator@WIN-NDKT0FRJP7R ~/Desktop/TrinityCore (master)
$