Commit 9982c37a authored by Ben Boeckel's avatar Ben Boeckel

gitsetup: update the import

This removes the gitlab-push alias and adds the gitlab-sync utility. The
gitlab-push is removed because it does not support LFS that well and
since ExternalData is not used, there's little technical necessity for
it to exist.
parent e2a0daa4
......@@ -16,5 +16,5 @@ git config rebase.stat true
git config branch.master.rebase true
# Record the version of this setup so Scripts/pre-commit can check it.
SetupForDevelopment_VERSION=3
SetupForDevelopment_VERSION=4
git config hooks.SetupForDevelopment ${SetupForDevelopment_VERSION}
......@@ -6,7 +6,8 @@ echo "Setting up useful Git aliases..." &&
git config alias.pullall '!bash -c "git pull && git submodule update --init"' &&
git config alias.prepush 'log --graph --stat origin/master..' &&
# Alias to push the current topic branch to GitLab
git config alias.gitlab-push '!bash utilities/gitsetup/git-gitlab-push' &&
( git config --unset alias.gitlab-push; true ) &&
# Alias to sync the current topic branch from GitLab
git config alias.gitlab-sync '!bash utilities/gitsetup/git-gitlab-sync' &&
true
......@@ -12,7 +12,7 @@ readonly tag="setup"
readonly paths="
.gitattributes
git-gitlab-push
git-gitlab-sync
setup-gitlab
setup-hooks
setup-lfs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment