mirror of
https://github.com/DictXiong/dotfiles.git
synced 2025-07-04 06:40:29 +08:00
gdebug supports empty; --dry-run wip
This commit is contained in:
parent
cfca3ad145
commit
b2e26067ac
4
.zshrc2
4
.zshrc2
@ -100,7 +100,7 @@ alias "se"='sudo -sE'
|
|||||||
alias "pbd"='ping baidu.com'
|
alias "pbd"='ping baidu.com'
|
||||||
alias "p114"='ping 114.114.114.114'
|
alias "p114"='ping 114.114.114.114'
|
||||||
alias "p666"='ping6 2001:da8::666'
|
alias "p666"='ping6 2001:da8::666'
|
||||||
alias "gdebug"='git add -A; git commit -m "bug fix ($(date))"'
|
alias "gdebug"='git add -A; git commit --allow-empty -m "bug fix ($(date))"'
|
||||||
case $(bash "$DOTFILES/tools/common.sh" get_os_type) in
|
case $(bash "$DOTFILES/tools/common.sh" get_os_type) in
|
||||||
macos ) alias l='ls -lAGh -D "%y-%m-%d %H:%M"' ;;
|
macos ) alias l='ls -lAGh -D "%y-%m-%d %H:%M"' ;;
|
||||||
* ) alias l='ls -lAGh --time-style="+%y-%m-%d %H:%M"' ;;
|
* ) alias l='ls -lAGh --time-style="+%y-%m-%d %H:%M"' ;;
|
||||||
@ -165,7 +165,7 @@ dfs()
|
|||||||
$EDITOR ~/.config/dotfiles/env
|
$EDITOR ~/.config/dotfiles/env
|
||||||
;;
|
;;
|
||||||
force-update ) (
|
force-update ) (
|
||||||
cd "$DOTFILES"
|
cd "$DOTFILES"
|
||||||
git fetch --all
|
git fetch --all
|
||||||
ref=$(git symbolic-ref --short HEAD 2> /dev/null) || ref=$(git rev-parse --short HEAD 2> /dev/null) || return 0
|
ref=$(git symbolic-ref --short HEAD 2> /dev/null) || ref=$(git rev-parse --short HEAD 2> /dev/null) || return 0
|
||||||
for i in $(git for-each-ref refs/heads --format='%(refname)') ; do git checkout ${i#refs/heads/} ; git pull --ff-only ; done
|
for i in $(git for-each-ref refs/heads --format='%(refname)') ; do git checkout ${i#refs/heads/} ; git pull --ff-only ; done
|
||||||
|
@ -15,6 +15,7 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
|
|||||||
-q*|--quite ) export DFS_QUIET=1 ;;
|
-q*|--quite ) export DFS_QUIET=1 ;;
|
||||||
-l*|--lite ) export DFS_LITE=1 ;;
|
-l*|--lite ) export DFS_LITE=1 ;;
|
||||||
--color ) export DFS_COLOR=1 ;;
|
--color ) export DFS_COLOR=1 ;;
|
||||||
|
--dry-run ) export DFS_DRY_RUN=1 ;;
|
||||||
--*=* ) GOT_OPTS+=("${ARG%%=*}" "${ARG#*=}") ;;
|
--*=* ) GOT_OPTS+=("${ARG%%=*}" "${ARG#*=}") ;;
|
||||||
--* ) GOT_OPTS+=("$ARG") ;;
|
--* ) GOT_OPTS+=("$ARG") ;;
|
||||||
-* ) GOT_OPTS+=("${ARG:0:2}") ;;
|
-* ) GOT_OPTS+=("${ARG:0:2}") ;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user