OK so setting up git v 2.8.1 is pretty straightforward. Cool, they fixed what had me tangled before!
But working with repositories is proving tricky. (I'm using a clone of https://github.com/ryanbr/fanboy-adblock as a base repository to practice with)
1) In Mercurial, if I have local changesets at the head of a repo and new changes have been made on the server, when I hg pull there is an anonymous branch created out of my local changesets. In similar situation in git, there are no "anonymous branches" - my custom changesets are effectively gone if I switch revisions and don't grab the cset IDs
My concern there is, if I accidentally `git pull` when I should have `git fetch` (or otherwise switch revision), what is the actual risk of losing my changesets (via auto or manual `git gc` or otherwise) and what can be done about it (that is, *before* they're garbage-collected )?
2) How to search for author by exact match of username (ignoring email)?
`git log --author=bar` matches barbaz, foobarbaz, etc in entire string "username <email>", whereas `hg log -u bar` does not wildcarding.
3) What does this mean?
In Mercurial I've backed out of that state by doing `hg update -C -r <revision>` which I think is the equivalent of `git checkout --force <revision>`Warning: Running git merge with non-trivial uncommitted changes is
discouraged: while possible, it may leave you in a state that is hard
to back out of in the case of a conflict.
Why wouldn't that work in git?