]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a3a02b 75c6976)
Merge branch 'es/rebase-i-no-abbrev' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:50 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:50 +0000 (15:45 -0700)
commitf8a3fd28fd9e61852f5944335e7338c52c8c5abd
tree5bf4dc994ba91b67bf5df68c01ebc6a2ee1cd1e2tree | snapshot
parent9a3a02b605ae58f5d61e48f213cf11bef3379739commit | diff
parent75c69766554c4b34ede65502d481dd7beb7f3388commit | diff
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
git-rebase--interactive.sh diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.