Change the commadns to use new style 'git COMMAND', without the dash.
Use better syntax in output displayed to user that suggests to use
--continue|--abort commands.
Signed-off-by: Jari Aalto <jari.aalto AT cante.net>
---
git-rebase.sh | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index bdcea0e..37ba8a8 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -21,7 +21,7 @@ Note that if <branch> is not specified on the command line, the
currently checked out branch is used. You must be in the top
directory of your project to start (or continue) a rebase.
-Example: git-rebase master~1 topic
+Example: git rebase master~1 topic
A---B---C topic A'\''--B'\''--C'\'' topic
/ --> /
@@ -63,7 +63,7 @@ continue_merge () {
cmt=`cat "$dotest/current"`
if ! git diff-index --quiet HEAD --
then
- if ! git-commit -C "$cmt"
+ if ! git commit -C "$cmt"
then
echo "Commit failed, please do not call \"git commit\""
echo "directly, but instead do one of the following: "
@@ -94,7 +94,7 @@ call_merge () {
eval GITHEAD_$cmt='"${cmt_name##refs/heads/}~$(($end - $msgnum))"'
eval GITHEAD_$hd='$(cat "$dotest/onto_name")'
export GITHEAD_$cmt GITHEAD_$hd
- git-merge-$strategy "$cmt^" -- "$hd" "$cmt"
+ git merge-$strategy "$cmt^" -- "$hd" "$cmt"
rv=$?
case "$rv" in
0)
@@ -111,7 +111,7 @@ call_merge () {
;;
*)
die "Unknown exit code ($rv) from command:" \
- "git-merge-$strategy $cmt^ -- HEAD $cmt"
+ "git merge-$strategy $cmt^ -- HEAD $cmt"
;;
esac
}
@@ -279,7 +279,7 @@ else
if test -d "$dotest"
then
die "previous dotest directory $dotest still exists." \
- 'try git-rebase < --continue | --abort >'
+ 'try git rebase {--continue|--abort}'
fi
fi
@@ -315,7 +315,7 @@ fi
case "$#" in
2)
branch_name="$2"
- git-checkout "$2" || usage
+ git checkout "$2" || usage
;;
*)
if branch_name=`git symbolic-ref -q HEAD`
@@ -363,7 +363,7 @@ esac
# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
echo "First, rewinding head to replay your work on top of it..."
-git-reset --hard "$onto"
+git reset --hard "$onto"
# If the $onto is a proper descendant of the tip of the branch, then
# we just fast forwarded.
@@ -387,7 +387,7 @@ then
exit $ret
fi
-# start doing a rebase with git-merge
+# start doing a rebase with "git merge"
# this is rename-aware if the recursive (default) strategy is used
mkdir -p "$dotest"
--
1.5.4-rc5.GIT-dirty
--
Welcome to FOSS revolution: we fix and modify until it shines
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
