From: Junio C Hamano Date: Mon, 17 Jul 2006 08:08:11 +0000 (-0700) Subject: Merge branch 'sp/reflog' X-Git-Tag: v1.4.2-rc1^0 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b9718d41c7e9c171e432bafac97a33be36f0e2bf;p=git.git 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. --- b9718d41c7e9c171e432bafac97a33be36f0e2bf