you are viewing a single comment's thread.

view the rest of the comments →

[–]boredzo 1 point2 points


Interactive commits via the command line scare me. I mess up so often. Maybe because I am on Windows.

I used to do them in hg all the time, but Git's version is less without-a-tightrope when you interactively add to the index rather than interactively directly committing, since you can then look at the index, see whether you screwed up, and make repairs if you did, and then only commit once it's good.

Nowadays, I use a Mac app called SourceTree that wraps both Git and Mercurial. I don't think it supports interactive commit (record) in Mercurial, but it does support hunk-by-hunk and even line-by-line staging and unstaging in Git.

There are some GUI Git clients for Windows.

TFS does not allow you to unshelve a shelve from another branch. Does Git allow you to unstash something you stashed in another branch?

I don't know if you can do that with the actual git stash apply command, but you can do it with checkout or diff by specifying the right commits (one of which should be the stash). See the other person's reply.