![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 1 Aug 2006 06:02:28 +0000 (23:02 -0700) | ||
| commit | bc9e1b8483b16d117d2f868f96e354be2a678d52 | |
| tree | f20e27d69e40c946b3204880b68228ee8839d0a0 | tree | snapshot |
| parent | 056d6d4e89c9477c4bd4b7c0d81ee51ab5602eb9 | commit | diff |
| parent | d587ed13bc37550a6d21067127f6c057c5d5e7fc | commit | diff |
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.
* 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.