Compare commits

..

11 Commits

2 changed files with 10 additions and 4 deletions

View File

@ -171,7 +171,7 @@ function grbi {
git checkout ${PARENT}
git pull
echo "Rebasing on" ${PARENT}
echo "Rebasing on ${PARENT}"
# Back to previous branch
git checkout ${BRANCH}
@ -196,7 +196,7 @@ function gai {
# Save parent branch
PARENT=$(git_parent)
echo "Rebasing with autofixup on" ${PARENT}
echo "Rebasing with autofixup on ${PARENT}"
git autofixup ${PARENT}
git rebase --interactive --autosquash ${PARENT}
@ -206,14 +206,21 @@ function gai {
# ║ ╦│ │ ╠═╝├┬┘│ │├┤ ││ ├┤
# ╚═╝┴ ┴ ╩ ┴└─└─┘└ ┴┴─┘└─┘
function git_config {
echo "User: $(git config user.name)"
echo "Mail: $(git config user.email)"
}
function git_pro {
git config --global user.name "Robin-Charles GUIHENEUF"
git config --global user.email rguiheneuf@netatmo.com
git_config
}
function git_perso {
git config --global user.name "Robin-Charles Guihéneuf"
git config --global user.email robin-charles@hotmail.fr
git_config
}
# ╔═╗┬┌┬┐ ╔═╗┌┬┐┌─┐┌┐┌┌┬┐

View File

@ -51,6 +51,5 @@
"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
"C_Cpp.intelliSenseEngine": "Tag Parser",
"diffEditor.ignoreTrimWhitespace": false,
"python.languageServer": "Microsoft",
"gitlab.instanceUrl":"https://gitlab.corp.netatmo.com"
"python.languageServer": "Microsoft"
}