From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Oct 2013 22:45:50 +0000 (-0700)
Subject: Merge branch 'es/rebase-i-no-abbrev' into maint
X-Git-Tag: v1.8.4.2~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f8a3fd28fd9e61852f5944335e7338c52c8c5abd?hp=f8a3fd28fd9e61852f5944335e7338c52c8c5abd

Merge branch 'es/rebase-i-no-abbrev' into maint

* es/rebase-i-no-abbrev:
rebase -i: fix short SHA-1 collision
t3404: rebase -i: demonstrate short SHA-1 collision
t3404: make tests more self-contained

Conflicts:
t/t3404-rebase-interactive.sh
---