andrejus/dotfiles
1
1
Fork 0
Code Issues Activity

more robust git pull

Browse Source
This commit is contained in:
Andrejus
2020-02-26 16:59:22 +00:00
parent cddac81977
commit 4199ec7c35
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bootstrap.sh
View File

@@ -64,7 +64,8 @@ if [[ ! -d $dotfiles_dir ]]; then
mkdir -p "$dotfiles_dir" mkdir -p "$dotfiles_dir"
git clone -q "$repository_url" "$dotfiles_dir" git clone -q "$repository_url" "$dotfiles_dir"
else else
git --git-dir="$dotfiles_dir/.git" pull -q origin master || true git --git-dir="$dotfiles_dir/.git" fetch -q
git --git-dir="$dotfiles_dir/.git" rebase -q --autostash FETCH_HEAD
fi fi
# Install dotfiles # Install dotfiles