Merge branch 'tr/previous-branch'
commit8712b3cdb0495f5a56b91cd67e2697412447a886
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Jan 2009 23:00:27 +0000 (28 15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Jan 2009 23:00:27 +0000 (28 15:00 -0800)
tree98dafb9b4f38617d73ef59c9085e01ee727af729
parentcd956c73a2cce6613a6cd19df6ccb9ff1b08f79a
parent73ff1a131b340633b2ec2a0e68490de721448f56
Merge branch 'tr/previous-branch'

* tr/previous-branch:
  t1505: remove debugging cruft
  Simplify parsing branch switching events in reflog
  Introduce for_each_recent_reflog_ent().
  interpret_nth_last_branch(): plug small memleak
  Fix reflog parsing for a malformed branch switching entry
  Fix parsing of @{-1}@{1}
  interpret_nth_last_branch(): avoid traversing the reflog twice
  checkout: implement "-" abbreviation, add docs and tests
  sha1_name: support @{-N} syntax in get_sha1()
  sha1_name: tweak @{-N} lookup
  checkout: implement "@{-N}" shortcut name for N-th last branch

Conflicts:
sha1_name.c
builtin-checkout.c
cache.h
sha1_name.c