Code

Merge branch 'rs/rebase'
authorJunio C Hamano <junkio@cox.net>
Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700)
* rs/rebase:
  rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
  rebase: Fix the detection of fast-forwarding of the current branch to upstream.


Trivial merge