diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-27 00:28:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-27 00:28:34 +0200 |
| commit | d1ab71804fe2afff4afa664c46a938a72fd237a7 (patch) | |
| tree | ec51114efc56db221b29fc792c003fc3a8caa1db /git-rebase.sh | |
| parent | Merge branch 'jn/glossary-revision' (diff) | |
| parent | rebase: find orig_head unambiguously (diff) | |
| download | git-d1ab71804fe2afff4afa664c46a938a72fd237a7.tar.xz git-d1ab71804fe2afff4afa664c46a938a72fd237a7.zip | |
Merge branch 'ph/rebase-original'
* ph/rebase-original:
rebase: find orig_head unambiguously
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index b2f1c76dc3..2c692c33e9 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -473,7 +473,7 @@ case "$#" in head_name="detached HEAD" branch_name=HEAD ;# detached fi - orig_head=$(git rev-parse --verify "${branch_name}^0") || exit + orig_head=$(git rev-parse --verify HEAD) || exit ;; *) die "BUG: unexpected number of arguments left to parse" |