Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't assume a local `master` branch point. #7557

Merged
merged 3 commits into from Apr 15, 2019

Conversation

Projects
None yet
2 participants
@jsirois
Copy link
Member

commented Apr 14, 2019

I, for one, always track upstream/master where upstream is
https://github.com/pantsbuild/pants (ie: not my fork).

In case no tracking branch is defined we fall back to the prior
assumption of local master.

@jsirois jsirois force-pushed the jsirois:githook/master/dont-assume branch from 24c4351 to 32bd7d2 Apr 14, 2019

Show resolved Hide resolved build-support/common.sh Outdated
Show resolved Hide resolved build-support/githooks/pre-commit Outdated

jsirois added some commits Apr 14, 2019

Don't assume a local `master` branch point.
I for one always track `upstream/master` where upstream is
https://github.com/pantsbuild/pants (ie: not my fork).

In case no tracking branch is defined we fall back to the prior
assumption of local `master`.

@jsirois jsirois force-pushed the jsirois:githook/master/dont-assume branch from 045f100 to 9931c2e Apr 14, 2019

@jsirois jsirois merged commit efbf2dc into pantsbuild:master Apr 15, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jsirois jsirois deleted the jsirois:githook/master/dont-assume branch Apr 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.