Merge branch 'mz/rebase-abort-reflog-fix' into maint
commit37ad7ca7dbb0bef2b902f6bc7d3346ddff1667a5
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:35:44 +0000 (14 07:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 15:35:44 +0000 (14 07:35 -0800)
tree22fec01c1e15f007c681b68cc217688e1002f5f3
parente0cbf12bf7d8b46292774ac91db8757d60b0f4df
parent729ec9e23a13a0610a19a24901d0ab5e2bc44a12
Merge branch 'mz/rebase-abort-reflog-fix' into maint

* mz/rebase-abort-reflog-fix:
  rebase --abort: do not update branch ref
git-rebase.sh