diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-18 13:00:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-18 13:00:53 -0700 |
| commit | 66e06b6a17f1074401ad23f4b2a8a146b2900333 (patch) | |
| tree | 624bb2025dc0c236f8293648d31263d9ff9e67ac /git-rebase-script | |
| parent | [PATCH] Updates to glossary (diff) | |
| download | git-66e06b6a17f1074401ad23f4b2a8a146b2900333.tar.gz git-66e06b6a17f1074401ad23f4b2a8a146b2900333.zip | |
Stupid typo fix for git rebase.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase-script')
| -rwxr-xr-x | git-rebase-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase-script b/git-rebase-script index 7b1d4900bd..5bb3bd97af 100755 --- a/git-rebase-script +++ b/git-rebase-script @@ -26,7 +26,7 @@ case "$#" in esac upstream=`git-rev-parse --verify "$1"` && -ours=`git-rev-parse --verify "$ours_symbolic^` || exit +ours=`git-rev-parse --verify "$ours_symbolic"` || exit test "$(git-diff-cache --cached "$ours")" = "" || die "Your working tree does not match $ours_symbolic." |