Junio C Hamano f8a3fd28fd 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

2013-10-17 15:45:50 -07:00

26 KiB

Raw Blame History

View Raw