diff options
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index aae94d2f6f..6fd3105b54 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -167,8 +167,7 @@ pick_one () { if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1" then output git reset --hard $sha1 - sha1=$(git rev-parse --short $sha1) - output warn Fast-forward to $sha1 + output warn Fast-forward to $(git rev-parse --short $sha1) else output git cherry-pick "$@" fi |