summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorLibravatar Robert Shearman <rob@codeweavers.com>2006-07-27 10:32:46 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-31 00:15:59 -0700
commitd587ed13bc37550a6d21067127f6c057c5d5e7fc (patch)
tree6cdf47dcc4fbaf35949f99e8e4e1ba668b9de7f2 /git-rebase.sh
parentrebase: Fix the detection of fast-forwarding of the current branch to upstream. (diff)
downloadtgif-d587ed13bc37550a6d21067127f6c057c5d5e7fc.tar.xz
rebase: Make the fast-fowarding message more user-friendly by using branch names instead of SHA1 IDs.
Signed-off-by: Robert Shearman <rob@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 240032f32d..7d3a5d0e71 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -280,7 +280,7 @@ git-reset --hard "$onto"
# we just fast forwarded.
if test "$mb" = "$branch"
then
- echo >&2 "Fast-forwarded $branch to $newbase."
+ echo >&2 "Fast-forwarded $branch_name to $onto_name."
exit 0
fi