diff options
| author | Mike McQuaid | 2016-04-22 10:06:59 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-04-22 10:06:59 +0100 |
| commit | 2921795668970f9b5598037fc55940d29ba941d6 (patch) | |
| tree | 34fdce9e4a475ae0802134941a1c4d39cbe62fb4 /Library | |
| parent | 341b64cc962f8ff69a37d7e20f6d94c7d5658ca7 (diff) | |
| download | brew-2921795668970f9b5598037fc55940d29ba941d6.tar.bz2 | |
update: rebase (rather than merge) by default.
We want to always avoid merge commits being committed to Homebrew so
this feels like a better fit.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index cc8d62608..29206b37f 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -1,8 +1,9 @@ -#: * `update` [`--rebase`]: +#: * `update` [`--merge`]: #: Fetch the newest version of Homebrew and all formulae from GitHub using #: `git`(1). #: -#: If `--rebase` is specified then `git pull --rebase` is used. +#: If `--merge` is specified then `git merge` is used to include updates +#: (rather than `git rebase`). brew() { "$HOMEBREW_BREW_FILE" "$@" @@ -199,7 +200,7 @@ pull() { # ensure we don't munge line endings on checkout git config core.autocrlf false - if [[ -n "$HOMEBREW_REBASE" ]] + if [[ -z "$HOMEBREW_MERGE" ]] then git rebase "${QUIET_ARGS[@]}" "origin/$UPSTREAM_BRANCH" else @@ -236,7 +237,7 @@ homebrew-update() { --help) brew help update; exit $? ;; --verbose) HOMEBREW_VERBOSE=1 ;; --debug) HOMEBREW_DEBUG=1;; - --rebase) HOMEBREW_REBASE=1 ;; + --merge) HOMEBREW_MERGE=1 ;; --simulate-from-current-branch) HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH=1 ;; --preinstall) HOMEBREW_UPDATE_PREINSTALL=1 ;; --*) ;; |