diff options
Diffstat (limited to 'fetcher.sh')
| -rwxr-xr-x | fetcher.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fetcher.sh b/fetcher.sh index e215846c87a6..eb9de4e11b6d 100755 --- a/fetcher.sh +++ b/fetcher.sh @@ -109,9 +109,9 @@ for ((i=0; i < ${#lines[@]}; i++)); do ;; pull) if $dryrun; then - cmd="git -C $path pull -n $remote $branch" + cmd="git -C $path pull --ff-only -n $remote $branch" else - cmd="git -C $path pull $remote $branch" + cmd="git -C $path pull --ff-only $remote $branch" fi ;; *) |