Add to gitconfig

Merge branch 'master' of git.clortox.com:tyler/neodot
Change path on .bashrc
2023-12-01 14:02:55 -05:00 · 2023-12-01 14:02:19 -05:00 · 2023-12-01 14:01:08 -05:00
2 changed files with 4 additions and 2 deletions
--- a/.bashrc
+++ b/.bashrc
@ -122,6 +122,6 @@ echo -e "${_PROMPT_HEAD_}#${_PROMPT_VAR_}\x1b[3m $(shuf -n 1 ~/.desktop/messages
 shopt -s histappend
 PROMPT_COMMAND="history -a; history -c; history -r;$PROMPT_COMMAND"

-PROG=tea source "~/.config/tea/autocomplete.sh"
-PROG=pass source "~/.local/bin/pass-completion.sh"
+PROG=tea source "$HOME/.config/tea/autocomplete.sh"
+PROG=pass source "$HOME/.local/bin/pass-completion.sh"

--- a/.gitconfig##default
+++ b/.gitconfig##default
@ -12,3 +12,5 @@
 	clean = git-lfs clean -- %f
 [commit]
 	gpgsign = true
+[pull]
+	rebase = false
Author	SHA1	Message	Date
Tyler Perkins	cdba695815	Add to gitconfig	2023-12-01 14:02:55 -05:00
Tyler Perkins	b07547d89c	Merge branch 'master' of git.clortox.com:tyler/neodot	2023-12-01 14:02:19 -05:00
Tyler Perkins	06bcea1288	Change path on .bashrc	2023-12-01 14:01:08 -05:00