Code

Merge branch 'sp/reflog' v1.4.2-rc1
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)
commitb9718d41c7e9c171e432bafac97a33be36f0e2bf
tree22f2ceb1019de1fa335e4f31f5fa61f84b231f13
parent7b520e62a2738ce776d1c9f11144021ff1fc63b6
parent8ef1c7c77d3e5950a839d9ae348827fa288a9a11
Merge branch 'sp/reflog'

* 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.