> Anyway, in your first email you asked how you can merge that branch > into 'master'. The command 'git merge origin/strings' will "merge" it > without actually creating a merge commit, because 'strings' builds > entirely on top of 'master'; this is what Git calls a "fast-forward > merge". If you do want a merge commit, then run 'git merge --no-ff > origin/strings'.
Interestingly enough it is impossible in mercurial to have a (not ff) merge in mercurial in this situation, because you have only one head (linear history) and two bookmarks. That is one thing I dislike in mercurial, but it can be easily avoided by using named branches or topics, but any way this is off topic.
smime.p7s
Description: S/MIME cryptographic signature
