diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-20 19:11:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-20 21:31:00 -0800 |
| commit | bcf316187699c5e97bf47c1b8a00c844bf809fbc (patch) | |
| tree | 32db926508d63acebf15513e10c99dc4ee0c96df | |
| parent | 11a6ddb2c8a81815ee9d5411638487ee99770a0b (diff) | |
| download | git-bcf316187699c5e97bf47c1b8a00c844bf809fbc.tar.gz git-bcf316187699c5e97bf47c1b8a00c844bf809fbc.tar.xz | |
git-rebase: allow rebasing a detached HEAD.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-rebase.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index c8bd0f99d..99cedadda 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -275,8 +275,12 @@ case "$#" in git-checkout "$2" || usage ;; *) - branch_name=`git symbolic-ref HEAD` || die "No current branch" - branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` + if branch_name=`git symbolic-ref -q HEAD` + then + branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` + else + branch_name=HEAD ;# detached + fi ;; esac branch=$(git-rev-parse --verify "${branch_name}^0") || exit |