chore(git): set pull.rebase to false
This commit is contained in:
parent
928e7001f3
commit
584f3740e7
2 changed files with 13 additions and 2 deletions
|
@ -9,3 +9,5 @@
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
[safe]
|
[safe]
|
||||||
directory = /appdata
|
directory = /appdata
|
||||||
|
[pull]
|
||||||
|
rebase = false
|
||||||
|
|
|
@ -15,6 +15,15 @@ function install_neovim {
|
||||||
rm ~/nvim.tar.gz
|
rm ~/nvim.tar.gz
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# installs
|
||||||
|
function install_neovim {
|
||||||
|
wget --output-document ~/nvim.tar.gz https://github.com/neovim/neovim/releases/download/stable/nvim-linux-x86_64.tar.gz > /dev/null 2>&1
|
||||||
|
tar xvf ~/nvim.tar.gz -C ~/ > /dev/null 2>&1
|
||||||
|
rm -rf ~/nvim
|
||||||
|
mv ~/nvim-linux-x86_64 ~/nvim
|
||||||
|
rm ~/nvim.tar.gz
|
||||||
|
}
|
||||||
|
|
||||||
# Main Logic
|
# Main Logic
|
||||||
if ! command -v wget &> /dev/null; then
|
if ! command -v wget &> /dev/null; then
|
||||||
echo "Error: wget is not installed. Please install it before running this script."
|
echo "Error: wget is not installed. Please install it before running this script."
|
||||||
|
@ -27,7 +36,7 @@ read choice
|
||||||
# 1 for all
|
# 1 for all
|
||||||
case "$choice" in
|
case "$choice" in
|
||||||
1)
|
1)
|
||||||
echo "Installing all apps."
|
echo "Installing all apps..."
|
||||||
install_neovim
|
install_neovim
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Installation complete."
|
echo "Installation complete."
|
||||||
|
@ -36,7 +45,7 @@ case "$choice" in
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
2)
|
2)
|
||||||
echo "Installing neovim stable."
|
echo "Installing neovim stable..."
|
||||||
install_neovim
|
install_neovim
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Installation complete."
|
echo "Installation complete."
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue