Fix auto pull
This commit is contained in:
parent
1bec83a13d
commit
8dac62d652
2 changed files with 8 additions and 5 deletions
2
.bashrc
2
.bashrc
|
@ -105,7 +105,7 @@ fi
|
||||||
|
|
||||||
# set PATH so it includes user's private bin if it exists
|
# set PATH so it includes user's private bin if it exists
|
||||||
if [ -d "$HOME/bin" ] ; then
|
if [ -d "$HOME/bin" ] ; then
|
||||||
PATH="$HOME/bin:$PATH"
|
PATH="$HOME/bin:$PATH:$HOME/.local/bin"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ~/.bash-fzfrc ] ; then
|
if [ -f ~/.bash-fzfrc ] ; then
|
||||||
|
|
9
pull.sh
9
pull.sh
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
if [ -f ~/git/dotfiles ] ; then
|
if [ -d ~/git/dotfiles ] ; then
|
||||||
git config pull.rebase false
|
(git config --global user.email "matt@nelim.org"
|
||||||
(cd ~/git/dotfiles && git pull) # test if work
|
git config --global user.name "matt1432"
|
||||||
|
cd ~/git/dotfiles &&
|
||||||
|
git config pull.rebase false &&
|
||||||
|
git pull) # test if work
|
||||||
fi
|
fi
|
Loading…
Reference in a new issue