For git on the command line, I use day to day 4 commands aliased:
alias status="git status"
alias commit="git add --all .;git commit -a -m"
alias pull="git pull --rebase"
alias push="git push"
So, typically status - find out what's going on
pull - grab any changes from others and replay mine on top
commit - add my files and changes
push - at the end of the day send changes up to the server
Occasionally I'll use stash or tag, which are also pretty simple and straightforward. Yes the command line UI could be improved, but it's not much harder than svn or cvs.This in particular I find curious:
We keep things under control by maintaining detailed sample scripts for everyone to refer to.
Why not set up a file with aliases in it if you are asking people to refer to cheat sheets? The basic commands as above are painfully simple, most people don't even need to branch and can get by just by pulling, committing and pushing, but branches aren't particularly complex in git either...
For non-programmer clients, for any version control system I'd get them to use a GUI like GitX, and they'll never touch the command line - that's very similar to svn GUIs, and frankly I doubt they'd know the difference.
It's high time this sort of version control was integrated into operating systems though - life would be a lot simpler if the Mac OS Finder for example had built in support for a common system like git with a user friendly front-end. I can't count the number of clients and colleagues who have made their own crude version control system by renaming files with version nos or initials to track changes - there has to be a better way.
> We now use git for everything, because it seems like it is the thing to do,
You nailed it. And IMO this current obsession with Git/Github is bordering on unhealthy. I really wish/hope this fad dies out fast!
Also anecdotal, but the graphic designers at our company have no problem using Git.
So much easier conceptually, the cmd line utility was written for actual humans, and it has sequential commit numbers.
That right there illustrates the disconnect that causes some people to dislike git while others love it. Git is truly distributed.
In a distributed system, commits are not totally ordered. It is fundamentally impossible to give them all meaningful sequential numbers, because some are really neither newer nor older than others. They are "in parallel".
Git excels at truly distributed workflows, and distributed workflows dominate in open source. That's why git dominates the open source world. The basic issue in open source is this: code is shared across organizational boundaries. You need to make and deploy a change today, without knowing or necessarily even caring whether the upstream project is going to take the patch. But your code needs to stay consistent and cleanly mergeable at every point through this process, even as multiple patches are flying in multiple directions.
Git commit ids are a hash of the commit content. This has very nice properties in that:
- Ids are duplicate if and only if the commit is identical (the collision chance is so low it's not worth considering)
- It's content-addressable
And you can refer to it by any unique prefix, so it's not a pain to type out (and you should only rarely be typing out particular commits instead of branches or tags).
If you see references to commits 143, 732, and 2021, you have some instant grasp on the ordering of those. acbe2f, 7624ab, bccc07 not so much.
Git keeps getting better, and I'd be hesitant to put anything new on Mercurial at this point. The tooling just doesn't seem to be keeping up any more.
The pain here is not because git is inherently harder, but because you'd gotten used to svn (including your conflict workaround) and I guess nobody wants to do the same learning for git.
Recently I tried Tourtoise git and I came to the conclusion that a beginner will probably rather learn the cmd line version because he will otherwise loose code.
SVN is unbelievably more difficult. The entire conceptual process of merging/rebasing/reintegrating is so much more difficult in SVN than git that I really cannot understand how people cope. Branches in SVN are such a pain in the ass that feature branching becomes a nightmare barely even worth doing. I get migraines trying to keep straight what things in SVN make changes on the server and what things make changes locally only that I can sit on for a while. Being centralized seems to raise the stakes of just about every operation, whereas with git I can take it slow, get everything right, and not involve other people until I decide it is the right time to do so.
A month-long stint of working with another team that uses SVN for some incomprehensible reason left me seriously considering seeing a doctor about some blood pressure medicine. I swear to the gods I would rather use quilt.
You can do this in git as well.
git has cut the team in 2. The graphic designers no longer know how to commit their work, nor do the frontenders, nor do most of the project managers. In particular, when a conflict comes up, nobody knows how to resolve the conflict (with Subversion we had a simple rule: "If you get a conflict, save your work outside of the project, then "accept theirs full", then re-integrate your work. A pain, but non-technical people could manage it). Instead, all of those people now send their work to the programmers, via email or Dropbox, and they say "Please integrate this into the project". This increases the amount of work that the programmers have to do.
We now use git for everything, because it seems like it is the thing to do, and it helps the programmers merge their work together. But the price is high: the loss of half the team, who can no longer use the version control system.