mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
37bf9fadd7
This includes updated to the latest master. To help with that, I added an alias to SetupForDevelopment.sh to update the master branch regardless of what branch you are on.
30 lines
1.0 KiB
Bash
Executable File
30 lines
1.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
cd "${BASH_SOURCE%/*}/.." &&
|
|
Utilities/GitSetup/setup-user && echo &&
|
|
Utilities/GitSetup/setup-hooks && echo &&
|
|
(Utilities/GitSetup/setup-upstream ||
|
|
echo 'Failed to setup origin. Run this again to retry.') && echo &&
|
|
(Utilities/GitSetup/setup-gitlab ||
|
|
echo 'Failed to setup GitLab. Run this again to retry.') && echo &&
|
|
Utilities/GitSetup/tips
|
|
|
|
|
|
echo "Setting up useful Git aliases..." &&
|
|
|
|
# Rebase master by default
|
|
git config rebase.stat true
|
|
git config branch.master.rebase true
|
|
|
|
# General aliases that could be global
|
|
git config alias.pullall '!bash -c "git pull && git submodule update --init"' &&
|
|
git config alias.prepush 'log --graph --stat origin/master..' &&
|
|
git config alias.pull-master 'fetch origin master:master' &&
|
|
|
|
# Alias to push the current topic branch to GitLab
|
|
git config alias.gitlab-push '!bash Utilities/GitSetup/git-gitlab-push' &&
|
|
echo "Set up git gitlab-push" &&
|
|
git config alias.gitlab-sync '!bash Utilities/GitSetup/git-gitlab-sync' &&
|
|
echo "Set up git gitlab-sync" &&
|
|
true
|