Scenario:
Local git repo, default master branch
FTP server with content of the repo (non git), synchronized daily with the local repo, master branch
Workflow:
user1 is working on local git repo (git add, working directory clean)
user2 (non git user) changed files directly on the FTP server
How can I import all files changed on FTP to the local git repo and see what has changed?