diff options
| -rwxr-xr-x | git-rebase--interactive.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index db10dd7b29..aae94d2f6f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -167,7 +167,6 @@ pick_one () { if test -z "$no_ff" -a "$current_sha1" = "$parent_sha1" then output git reset --hard $sha1 - test "a$1" = a-n && output git reset --soft $current_sha1 sha1=$(git rev-parse --short $sha1) output warn Fast-forward to $sha1 else |