diff options
| author | Josh Hagins | 2015-07-10 09:46:35 -0400 |
|---|---|---|
| committer | Mike McQuaid | 2015-09-07 12:05:20 +0100 |
| commit | f431e543a5f155fd64d397ae04d269c3907f42b7 (patch) | |
| tree | 38b007382203bc5c327b969831951ab94254473a /Library/Homebrew/cmd | |
| parent | 8d2e757253bba2e9a471ca1ff8285df62076db9a (diff) | |
| download | brew-f431e543a5f155fd64d397ae04d269c3907f42b7.tar.bz2 | |
update: explicitly no-ff merge and rebase.
This overrides user configuration which may do otherwise.
Closes Homebrew/homebrew#41570.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
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 |