Merge branch 'sp/reflog'
authorJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 08:08:11 +0000 (01:08 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 17 Jul 2006 08:08:11 +0000 (01:08 -0700)
* sp/reflog:
Record rebase changes as 'rebase' in the reflog.
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.

Trivial merge