Compare commits
11 Commits
24e9117c04
...
1a3d439586
Author | SHA1 | Date | |
---|---|---|---|
1a3d439586 | |||
e0875add3c | |||
c9a470b116 | |||
c4057d5f67 | |||
cd430addd0 | |||
c870497f0b | |||
1fd0a07b13 | |||
f9b82413d6 | |||
53005db9e8 | |||
cc0af0c824 | |||
ab6b0917bd |
@ -171,7 +171,7 @@ function grbi {
|
|||||||
git checkout ${PARENT}
|
git checkout ${PARENT}
|
||||||
git pull
|
git pull
|
||||||
|
|
||||||
echo "Rebasing on ${PARENT}"
|
echo "Rebasing on" ${PARENT}
|
||||||
|
|
||||||
# Back to previous branch
|
# Back to previous branch
|
||||||
git checkout ${BRANCH}
|
git checkout ${BRANCH}
|
||||||
@ -196,7 +196,7 @@ function gai {
|
|||||||
# Save parent branch
|
# Save parent branch
|
||||||
PARENT=$(git_parent)
|
PARENT=$(git_parent)
|
||||||
|
|
||||||
echo "Rebasing with autofixup on ${PARENT}"
|
echo "Rebasing with autofixup on" ${PARENT}
|
||||||
|
|
||||||
git autofixup ${PARENT}
|
git autofixup ${PARENT}
|
||||||
git rebase --interactive --autosquash ${PARENT}
|
git rebase --interactive --autosquash ${PARENT}
|
||||||
@ -206,21 +206,14 @@ function gai {
|
|||||||
# ║ ╦│ │ ╠═╝├┬┘│ │├┤ ││ ├┤
|
# ║ ╦│ │ ╠═╝├┬┘│ │├┤ ││ ├┤
|
||||||
# ╚═╝┴ ┴ ╩ ┴└─└─┘└ ┴┴─┘└─┘
|
# ╚═╝┴ ┴ ╩ ┴└─└─┘└ ┴┴─┘└─┘
|
||||||
|
|
||||||
function git_config {
|
|
||||||
echo "User: $(git config user.name)"
|
|
||||||
echo "Mail: $(git config user.email)"
|
|
||||||
}
|
|
||||||
|
|
||||||
function git_pro {
|
function git_pro {
|
||||||
git config --global user.name "Robin-Charles GUIHENEUF"
|
git config --global user.name "Robin-Charles GUIHENEUF"
|
||||||
git config --global user.email rguiheneuf@netatmo.com
|
git config --global user.email rguiheneuf@netatmo.com
|
||||||
git_config
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function git_perso {
|
function git_perso {
|
||||||
git config --global user.name "Robin-Charles Guihéneuf"
|
git config --global user.name "Robin-Charles Guihéneuf"
|
||||||
git config --global user.email robin-charles@hotmail.fr
|
git config --global user.email robin-charles@hotmail.fr
|
||||||
git_config
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# ╔═╗┬┌┬┐ ╔═╗┌┬┐┌─┐┌┐┌┌┬┐
|
# ╔═╗┬┌┬┐ ╔═╗┌┬┐┌─┐┌┐┌┌┬┐
|
||||||
|
@ -51,5 +51,6 @@
|
|||||||
"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
|
"vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue",
|
||||||
"C_Cpp.intelliSenseEngine": "Tag Parser",
|
"C_Cpp.intelliSenseEngine": "Tag Parser",
|
||||||
"diffEditor.ignoreTrimWhitespace": false,
|
"diffEditor.ignoreTrimWhitespace": false,
|
||||||
"python.languageServer": "Microsoft"
|
"python.languageServer": "Microsoft",
|
||||||
|
"gitlab.instanceUrl":"https://gitlab.corp.netatmo.com"
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user