diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-29 02:06:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-29 02:06:57 +0100 |
| commit | d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9 (patch) | |
| tree | 88de4825ce11d7eaed4719b0b9db1d0e649f9107 /git-rebase.sh | |
| parent | bash completion: add diff options (diff) | |
| parent | scripts: do not get confused with HEAD in work tree (diff) | |
| download | git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.tar.xz git-d25430c5f88c7e7b4ce24c1b08e409f4345c4eb9.zip | |
Merge branch 'maint'
* maint:
scripts: do not get confused with HEAD in work tree
Improve description of git-branch -d and -D in man page.
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 461ca8d93f..bdcea0ed70 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -61,7 +61,7 @@ continue_merge () { fi cmt=`cat "$dotest/current"` - if ! git diff-index --quiet HEAD + if ! git diff-index --quiet HEAD -- then if ! git-commit -C "$cmt" then @@ -285,7 +285,7 @@ fi # The tree must be really really clean. git update-index --refresh || exit -diff=$(git diff-index --cached --name-status -r HEAD) +diff=$(git diff-index --cached --name-status -r HEAD --) case "$diff" in ?*) echo "cannot rebase: your index is not up-to-date" echo "$diff" |