diff options
| author | Manoel Brunnen | 2017-02-13 10:35:21 +0100 |
|---|---|---|
| committer | Manoel Brunnen | 2017-02-13 10:35:21 +0100 |
| commit | 5039c3f265364c9acb008b2208f4a29dd74de7ee (patch) | |
| tree | ad5542e6c0594507e3b6fb621861a6ae0cd1f6f3 /fetcher.sh | |
| parent | 06b3fd6d1f9718c842b8bbed03414dbd3ebfc945 (diff) | |
| download | aur-5039c3f265364c9acb008b2208f4a29dd74de7ee.tar.gz | |
ff-only
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 ;; *) |