How do you set up your working environment when developing websites?

Question

git

Hello.
I was puzzled by the question of how to establish the process of creating sites.
I'll describe how I did it. I work on windows, on a stationary win7, on a win8 laptop. Deployed denwer on both machines that point to the same folder syncing with dropbox. The sites themselves are stored in the same folder. There was some convenience, I worked on the laptop, on the desktop the current version, and vice versa.
How I roll out to the server: 1) Sites use cms Joomla, installed the akeeba backup component, using it I make a backup of the local version, and deploy the backup on the server, having completely cleared the previous version. I wrote a post about this on Habré: habrahabr.ru/post/205906
When I need to make minor edits, I do it right on the server. And so it turns out that in the end, after some time, my local version and the version on the server are different, the local one is more outdated. And in the case of serious work, I already do the reverse operation. I make a server backup and deploy it on the local machine.
There are thoughts that I am doing something wrong. Too many extra moves. Recently got acquainted with git and there is a suspicion that this is the solution to my problems?
As I understand it, I will need to configure it on the server, then pull it to the local machine. Edit there and just push back to the server?
Plus, I use notepad++ to work with code, probably in powerful systems like phpstorm, can I integrate with git and won't have to worry at all? Fixed the code, made comit, push to the server. And now I have up-to-date versions of the site everywhere, and plus the history of changes and the ability to roll back.
I understand that I stated everything very chaotically, but I really want to set everything up to increase efficiency, making the most of the potential of modern systems. Question to everyone, and directly to the developers of sites on joomla in particular, how did you set everything up for yourself? Indeed, with the same git and joomla there are nuances, a huge number of files, it is hardly necessary to track the entire structure of git.

Answer 1

Well, if you are forced to sit under Windows, then I had it like that.
as a server - Zend Server
everything else is standard.
for each project - create a separate account on bitbucket-e - and add your account to the admins one.
commit there as much as you want.
You can roll out to shared hosting using dploy.io

Answer 2

Web server - Openserver (before it was also Denver)
Editor - Sublime text 2
Synchronization - Yandex disk
Working with databases - phpMyAdmin
When git is needed - bitbucket
Setting tasks - trello ( trello.com )
FTP client - Total Commander

Answer 3

linux, lamp, git (gitlab, github, bitbucket), vim.