---
git-rebase--interactive.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 1698c3e..060b40f 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -600,9 +600,9 @@ do
MERGES_OPTION=--no-merges
fi
- SHORTUPSTREAM=$(git rev-parse --short $UPSTREAM)
- SHORTHEAD=$(git rev-parse --short $HEAD)
- SHORTONTO=$(git rev-parse --short $ONTO)
+ SHORTUPSTREAM=$(git rev-parse --short=7 $UPSTREAM)
+ SHORTHEAD=$(git rev-parse --short=7 $HEAD)
+ SHORTONTO=$(git rev-parse --short=7 $ONTO)
git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
--abbrev=7 --reverse --left-right --cherry-pick \
$UPSTREAM...$HEAD | \
--
1.5.4.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
