#Diffmerge git tutorial update#
#Diffmerge git tutorial full#

And it only stores the history of the last commit, it has to go back to the svn server to get more git stores the full history. When I was first trying Subversion, it was annoying to see the “.svn” directories it creates in each and every subdirectory in the repository. Git handles this by storing everything in a “.git” directory at the root of the repository.

Git is a DVCS (Distributed Version Control System) which means you can work without a server of any kind. I’m assuming you’re a programmer, if you’re reading this, and I think that you should be comfortable with the keyboard and a command-line (whether it’s Windows’ cmd.exe or the linux-like git bash) Git is Very Fast Quickly, without taking my fingers off the keyboard. Using git bash, I can stay at the root of the repository and see that a file was changed 5 sub-directories down, exactly which file it is, and optionally see exactly the changes made. Git has never gotten confused about a file status, I have seen TortoiseSVN show the wrong icon, and Starteam routinely gets the status wrong, or caches it, or just plain can’t figure it out. I alt-Tab from Delphi to my Git Bash look at what files have changed, maybe look at what changes have been made, commit the change or revert it, and then alt-Tab back to Delphi. I find that I am able to get to the information that I want to a lot easier (and it feels faster whether or not it is). I read a lot of blog posts where people say they don’t like git or other similar DVCSes because they don’t have good visual clients.

#Diffmerge git tutorial update#

Also Starteam has the nasty habit of not being able to determine the Status of a file, constantly saying Unknown even after an explicit Refresh (F5) and right click -> Update Status, instead of realizing a file is Current or Modified. It took a little while to get used to looking at Unix-style diffs (comparison of the last version of a file and what is currently on the disk), but now I definitely prefer it to working in Starteam or with TortoiseSVN which force you to use the mouse. I keep a Git bash (part of mSysGit) shell open all day while I’m working. Git can track all my little code changes, and then I checkin to Starteam to share with the other developers I really like having the benefits of Git, while not forcing the other developers to change how they work. Lately, I have been using Git for code management, in addition. At work, we use Borland Starteam for code management and bug/change tracking.