Code

Merge branch 'jc/branch-previous'
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 08:03:29 +0000 (00:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 Feb 2009 08:03:29 +0000 (00:03 -0800)
commit472e4744ad28dfa568a1a46e5268aa2babb7243b
tree4f10098f38d27bf77eef3a22e60e51c258ece7fb
parent48c9ab78f3c7a0cc51e8d17bb7e37a075996c223
parentc9717ee97075bb333684fa2f63e9136c5f7d89bf
Merge branch 'jc/branch-previous'

* jc/branch-previous:
  Teach @{-1} to git merge
  Teach the "@{-1} syntax to "git branch"