> I have tried gitk. Can you or someone tell me what the colours of
> the nodes in the top left signifies? Specifically, a commit of mine
> (done since all the merging I've been asking about) shows as yellow,
> whereas all the ones prior to that show as blue.
Nothing. It just tries to use different colours so you can tell the
lines apart. But the specific colour is no more meaningful than
shadings on a map.
> So what would be the correct way, before doing my fast-forward merge,
> to have made some kind of mark pointing at "a", which I could then have
> used to undo the fast-forward, without having to calculate the number
> of commits in between? (supposing my branch was not anchored at "a"
> but at some much earlier point)?
The basic tool to do that is "git tag <name>", which creates a tag with
the given name. (The difference between a tag and a branch is simply
that a branch is updated when you commit.)
However, most people don't bother with an explicit name; see the man page
for git-rev-parse for a list of all the ways to refer to old revisions.
@{1} is the usual syntax for "the current branch before the last change",
or you can use the older name ORIG_HEAD, too.
"git reflog" will show an extended history.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html