shortlog: support --pretty=format: option

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index e2d85eeeab79e60ef46a65cfee1fb4682dd4ba68..2597d777d6fa8e9beb2a660ecdc10366747b4e23 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -378,7 +378,7 @@ fi
 echo "First, rewinding head to replay your work on top of it..."
 git checkout "$onto^0" >/dev/null 2>&1 ||
        die "could not detach HEAD"
-# git reset --hard "$onto^0"
+git update-ref ORIG_HEAD $branch
 
 # If the $onto is a proper descendant of the tip of the branch, then
 # we just fast forwarded.