diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-14 13:01:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-14 13:01:01 -0800 |
| commit | b0d3e9baaa16c805ef941e8f26d55fb23f091ef5 (patch) | |
| tree | 142e8fb76c906de7b61b9bf55ab026bee2388aa3 /git-rebase.sh | |
| parent | a4adf54d38ba49e58511aaafd18e99e6d3d4dabb (diff) | |
| parent | 5073eb04d6f0e8ac2578140b9231817e2afefe50 (diff) | |
| download | git-b0d3e9baaa16c805ef941e8f26d55fb23f091ef5.tar.gz | |
Merge branch 'fk/usage'
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 638ff0dbc0..8a5f44aa5e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,6 +3,7 @@ # Copyright (c) 2005 Junio C Hamano. # +USAGE='<upstream> [<head>]' . git-sh-setup # Make sure we do not have .dotest @@ -19,7 +20,7 @@ you still have something valuable there.' fi # The other head is given. Make sure it is valid. -other=$(git-rev-parse --verify "$1^0") || exit +other=$(git-rev-parse --verify "$1^0") || usage # Make sure we have HEAD that is valid. head=$(git-rev-parse --verify "HEAD^0") || exit @@ -36,7 +37,7 @@ esac # If the branch to rebase is given, first switch to it. case "$#" in 2) - git-checkout "$2" || exit + git-checkout "$2" || usage esac # If the HEAD is a proper descendant of $other, we do not even need |