jay817/wiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bashrc: resolve merge conflict

Browse Source
This commit is contained in:
Jaewook Lee
2024-08-16 16:13:04 -04:00
parent a9647fbb7c
commit afc58aac1f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux-bash/bash_aliases.sh
View File

@@ -7,7 +7,8 @@ alias bat="batcat --paging=never"
alias my="sudo chown -R $(id -u):$(id -g)" alias my="sudo chown -R $(id -u):$(id -g)"
alias l="command ls -lh --color=auto" alias l="command ls -lh --color=auto"
alias ls="ls -alh --color=auto" alias ls="command ls -alh --color=auto"
alias ns="watch -n 0.1 nvidia-smi" alias ns="watch -n 0.1 nvidia-smi"
log() { log() {
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
@@ -91,6 +92,7 @@ alias df="df -h"
alias status="git status ." alias status="git status ."
alias push="git push" alias push="git push"
alias pull="git pull" alias pull="git pull"
alias fetch="git fetch"
add() { add() {
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
git add . git add .