You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
749 B
Bash
30 lines
749 B
Bash
#!/usr/bin/env bash
|
|
# vim:ts=4:sts=4:sw=4:et
|
|
#
|
|
# Author: Hari Sekhon
|
|
# Date: 2017-11-21 10:43:47 +0100 (Tue, 21 Nov 2017)
|
|
#
|
|
# https://github.com/harisekhon/Dockerfiles
|
|
#
|
|
# License: see accompanying Hari Sekhon LICENSE file
|
|
#
|
|
# If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
|
|
#
|
|
# https://www.linkedin.com/in/harisekhon
|
|
#
|
|
|
|
set -euo pipefail
|
|
[ -n "${DEBUG:-}" ] && set -x
|
|
srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
|
# shellcheck source=lib/git.sh
|
|
. "$srcdir/lib/git.sh"
|
|
|
|
# For Git < 2.0 may need to set:
|
|
#
|
|
# git config merge.defaultToUpstream true
|
|
|
|
foreachbranch 'git merge --no-edit && git merge master --no-edit'
|
|
|
|
git checkout master
|