Ever wonder what those yellow, blue dots in gitk stand for? Or why the visual branches in gitk do not correspond to the local branches you created? I found this post helpful:
Thanks, very helpful! And the second part gives a very good, very illustrative explanation of merge vs rebase.