diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 15:28:34 -0700 |
| commit | d1ab71804fe2afff4afa664c46a938a72fd237a7 (patch) | |
| tree | ec51114efc56db221b29fc792c003fc3a8caa1db /git-rebase.sh | |
| parent | 019eb0dd351ee53b875df27f6748bcb69dc02063 (diff) | |
| parent | ea709800302ecae8c2fbb03af01e36b7f9b4d042 (diff) | |
| download | git-d1ab71804fe2afff4afa664c46a938a72fd237a7.tar.gz | |
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" |