diff options
Diffstat (limited to 'Library/Homebrew/cmd')
| -rw-r--r-- | Library/Homebrew/cmd/update.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 33678db3a..1d4eb5928 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -196,7 +196,8 @@ class Updater safe_system "git", "config", "core.autocrlf", "false" args = ["pull"] - args << "--rebase" if ARGV.include? "--rebase" + args << "--ff" + args << ((ARGV.include? "--rebase") ? "--rebase" : "--no-rebase") args += quiet args << "origin" # the refspec ensures that 'origin/master' gets updated |