diff --git a/share/bash/.bashrc.private b/share/bash/.bashrc.private index 978cd9f..932d1b4 100644 --- a/share/bash/.bashrc.private +++ b/share/bash/.bashrc.private @@ -121,7 +121,7 @@ export CVS_RSH=ssh export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:bd=40;33;01:cd=40;33;01:or=01;05;37;41:mi=01;05;37;41:ex=01;32:*.cmd=01;32:*.exe=01;32:*.com=01;32:*.btm=01;32:*.bat=01;32:*.sh=01;32:*.csh=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.bz=01;31:*.tz=01;31:*.rpm=01;31:*.cpio=01;31:*.jpg=01;35:*.gif=01;35:*.bmp=01;35:*.xbm=01;35:*.xpm=01;35:*.png=01;35:*.tif=01;35:' export HISTTIMEFORMAT='%F %T ' export MYTOOL="${HOME}/tool" -export PATH="${MYTOOL}/bin:$PATH" +export PATH="${MYTOOL}/bin:$HOME/.local/bin:$PATH" export MANPATH="$MANPATH:/usr/local/share/man:${MYTOOL}/man:${MYTOOL}/share/man" export LD_LIBRARY_PATH="${HOME}/tool/lib" export TERM=screen diff --git a/share/git/.gitconfig b/share/git/.gitconfig index 53b8188..88b1518 100644 --- a/share/git/.gitconfig +++ b/share/git/.gitconfig @@ -26,8 +26,9 @@ lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all lg = !"git lg1" - rbc = rebase --continue rba = rebase --abort + rbc = rebase --continue + rbs = rebase --skip sr = svn rebase sd = svn dcommit st = status -s @@ -59,6 +60,7 @@ praise = blame pull = pull --ff-only sb = submodule + sbuir = submodule update --init --recursive ver = rev-parse --short wt = worktree wta = worktree add