pt/dot_config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge termux

Browse Source
This commit is contained in:
Paul Trowbridge 2023-10-28 19:23:11 -04:00
parent ae4ce36eb4
commit c8cf2c98da
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.bashrc
View File

@ -113,17 +113,13 @@ alias gr='git reset HEAD'
alias gc='git commit -v' alias gc='git commit -v'
alias gd='git difftool' alias gd='git difftool'
alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"' alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"'
<<<<<<< HEAD
vc() { vc() {
git add . git add .
git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")" git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")"
git push
} }
=======
alias cj='cd ~/storage/shared/Documents/journal/' alias cj='cd ~/storage/shared/Documents/journal/'
alias jr='cd ~/storage/shared/Documents/journal/ && git pull && vc && cd -' alias jr='cd ~/storage/shared/Documents/journal/ && git pull && vc && cd -'
alias hc='cd ~/storage/shared/Documents/hc_notes/ && git pull && git push && cd -' alias hc='cd ~/storage/shared/Documents/hc_notes/ && git pull && git push && cd -'
>>>>>>> c7bc5d1f60c8611a1f5a7e85b2cd5495696adc8e
# Add an "alert" alias for long running commands. Use like so: # Add an "alert" alias for long running commands. Use like so:
# sleep 10; alert # sleep 10; alert
@ -156,10 +152,10 @@ PAGER="less"
LESS="-S" LESS="-S"
export PSQL_PAGER="pspg" export PSQL_PAGER="pspg"
#if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
# GIT_PROMPT_ONLY_IN_REPO=1 GIT_PROMPT_ONLY_IN_REPO=1
# source $HOME/.bash-git-prompt/gitprompt.sh source $HOME/.bash-git-prompt/gitprompt.sh
#fi fi
bind 'set bell-style none' bind 'set bell-style none'