diff options
| -rw-r--r-- | .gitconfig | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -23,13 +23,11 @@ co = checkout cm = commit --verbose ls = log --oneline --decorate - la = log --oneline --decorate --numstat lg = log --oneline --graph - ; ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative - ; fl = log -u ldf = diff --cached HEAD^ - wdf = diff --color-words --word-diff-regex='[A-z0-9_]+|[^[:space:]]' - ; up = "!git remote update -p; git merge --ff-only @{u}" + locked = "!sh -c \"git ls-files -v | grep ^S | sed -e 's|S ||'\" -" + lock = "!sh -c \"git update-index --skip-worktree $1\" -" + unlock = "!sh -c \"git update-index --no-skip-worktree $1\" -" [push] default = current [pull] |