These articles may help: Git vs. Mercurial: Please Relax (Git is MacGyver and Mercurial is James Bond) The Differences Between Mercurial and Git Edit: Comparing Git and Mercurial to celebrities seems to be a trend. Here’s one more: Git is Wesley Snipes, Mercurial is Denzel Washington
The .gitignore file should be in your repository, so it should indeed be added and committed in, as git status suggests. It has to be a part of the repository tree, so that changes to it can be merged and so on. So, add it to your repository, it should not be gitignored. If you … Read more
I too have been looking for a case where, say, Subversion fails to merge a branch and Mercurial (and Git, Bazaar, …) does the right thing. The SVN Book describes how renamed files are merged incorrectly. This applies to Subversion 1.5, 1.6, 1.7, and 1.8! I have tried to recreate the situation below: cd /tmp … Read more
You can use git checkout — file You can do it without the — (as suggested by nimrodm), but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using — is best. You can also check out a particular version of a file: git checkout v1.2.3 … Read more
Disclaimer: I use Git, follow Git development on git mailing list, and even contribute a bit to Git (gitweb mainly). I know Mercurial from documentation and some from discussion on #revctrl IRC channel on FreeNode. Thanks to all people on on #mercurial IRC channel who provided help about Mercurial for this writeup Summary Here it … Read more
I have been where you are now, sceptical of the uses of distributed version control. I had read all the articles and knew the theoretical arguments, but I was not convinced. Until, one day, I typed git init and suddenly found myself inside a git repository. I suggest you do the same — simply try … Read more
I have just introduced a DVCS (Git in this case) in a large banking company, where Perforce, SVN or ClearCase was the centralized VCS of choices: I already knew of the challenges (see my previous answer “Can we finally move to DVCS in Corporate Software? Is SVN still a ‘must have’ for development?“) I have … Read more
The main feature all VCS use for the various task you are mentioning is branching: the ability to isolate a development effort in a collaborative way. Since it is a Central VCS, several developers can collaborate on a same branch, with pessimistic or optimistic locks on files, in order to develop a parallel history. But … Read more
I just got the same problem and just figured out what’s cause. Github seems only supports ssh way to read&write the repo, although https way also displayed ‘Read&Write’. So you need to change your repo config on your PC to ssh way: edit .git/config file under your repo directory find url=entry under section [remote “origin”] … Read more
It should just be: git diff –cached –cached means show the changes in the cache/index (i.e. staged changes) against the current HEAD. –staged is a synonym for –cached. –staged and –cached does not point to HEAD, just difference with respect to HEAD. If you cherry pick what to commit using git add –patch (or git … Read more