ason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$ git status
# On branch paperboys
# Your branch and 'origin/paperboys' have diverged,
# and have 14 and 3 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   login/conf/ladmin_athena.conf
#	modified:   login/conf/ladmin_local.conf.example
#	modified:   login/conf/lan_support.conf
#	modified:   login/conf/login_athena.conf
#	modified:   login/conf/login_local.conf.example
#	modified:   world/conf/char_athena.conf
#	modified:   world/conf/char_local.conf.example
#	modified:   world/conf/inter_athena.conf
#	modified:   world/conf/lan_support.conf
#	modified:   world/map/conf/atcommand_athena.conf
#	modified:   world/map/conf/atcommand_local.conf.example
#	modified:   world/map/conf/battle_athena.conf
#	modified:   world/map/conf/battle_local.conf.example
#	modified:   world/map/conf/help.txt.example
#	modified:   world/map/conf/magic.conf.template
#	modified:   world/map/conf/map_local.conf.example
#	modified:   world/map/conf/motd.txt.example
#	modified:   world/map/db/item_db.txt
#	deleted:    world/map/news.d/23-astral-extension.txt
#	modified:   world/map/news.html
#	modified:   world/map/news.txt
#	modified:   world/map/npc/001-1/_import.txt
#	modified:   world/map/npc/001-1/gossip.txt
#	modified:   world/map/npc/007-1/witch.txt
#	modified:   world/map/npc/008-1/annualeaster.txt
#	modified:   world/map/npc/008-1/diryn.txt
#	modified:   world/map/npc/009-1/_import.txt
#	modified:   world/map/npc/009-1/milly.txt
#	modified:   world/map/npc/009-4/torches.txt
#	modified:   world/map/npc/017-4/orum.txt
#	modified:   world/map/npc/018-2/caul.txt
#	modified:   world/map/npc/021-1/_import.txt
#	modified:   world/map/npc/021-1/npcs.txt
#	deleted:    world/map/npc/021-1/pauline.txt
#	modified:   world/map/npc/027-1/graves.txt
#	modified:   world/map/npc/027-1/monsters.txt
#	modified:   world/map/npc/052-1/channelling.txt
#	modified:   world/map/npc/052-2/partyroom.txt
#	modified:   world/map/npc/functions/dailyquest.txt
#	modified:   world/map/npc/functions/game_rules.txt
#	modified:   world/map/npc/functions/mob_points.txt
#	modified:   world/map/npc/items/magic_gm_top_hat.txt
#	modified:   world/map/npc/items/require_stat.txt
#	modified:   world/map/npc/items/restricted_item.txt
#	modified:   world/map/npc/scripts.conf
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	world/map/conf/grf-files.txt
#	world/map/conf/script_athena.conf
#	world/map/conf/water.txt
#	world/map/conf/water_height.txt
#	world/map/npc/001-1/alec.txt
#	world/map/npc/009-1/aldan.txt
#	world/map/npc/functions/paperboy.txt
#	world/map/npc/functions/paperboy.txt~
no changes added to commit (use "git add" and/or "git commit -a")
jason@jason-AY597AA-ABA-HPE-110f:~/Downloads/tmwa-server-data$