diff options
| author | Mike McQuaid | 2017-01-26 16:29:39 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2017-01-26 16:29:39 +0000 |
| commit | 3c91f5858a273733112cdd11373762e4b9357c1b (patch) | |
| tree | b7ad402c4930150e4cf2f3e914c7fdc6a6c2e5ab /Library | |
| parent | 1f97e3186a117541f127f6e52ce77238a2791147 (diff) | |
| download | brew-3c91f5858a273733112cdd11373762e4b9357c1b.tar.bz2 | |
update-reset: checkout with --force.
Otherwise it won't overwrite unmerged changes.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update-reset.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update-reset.sh b/Library/Homebrew/cmd/update-reset.sh index 32daffc96..3a9e1caa9 100644 --- a/Library/Homebrew/cmd/update-reset.sh +++ b/Library/Homebrew/cmd/update-reset.sh @@ -37,7 +37,7 @@ EOS echo echo "==> Resetting $DIR..." - git checkout -B master origin/master + git checkout --force -B master origin/master echo done } |