From: Junio C Hamano <junkio@cox.net>
Date: Tue, 1 Aug 2006 06:02:28 +0000 (-0700)
Subject: Merge branch 'rs/rebase'
X-Git-Tag: v1.4.2-rc3~24
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc9e1b8483b16d117d2f868f96e354be2a678d52;p=git.git

Merge branch 'rs/rebase'

* 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.
---

bc9e1b8483b16d117d2f868f96e354be2a678d52