opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Consolidate Git aliases

Browse source 
Move the `update` alias into the Git namespace, so it's now `git
update`, and remove the others that I wasn't using.
This commit is contained in:
Oliver Davies 2024-05-20 19:09:17 +01:00
parent 2382103445
commit ab20c7de69
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/shared/modules/git.nix
View file

@ -87,6 +87,8 @@
unassume = "update-index --no-assume-unchanged"; unassume = "update-index --no-assume-unchanged";
uncommit = "reset --soft HEAD^"; uncommit = "reset --soft HEAD^";
unstage = "reset"; unstage = "reset";
update =
"!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}"; upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
ureset = "!git reset --hard $(git upstream)"; ureset = "!git reset --hard $(git upstream)";
worktrees = "worktree list"; worktrees = "worktree list";

6
lib/shared/modules/zsh.nix
View file

@ -196,11 +196,7 @@
ialias cat="bat" ialias cat="bat"
ialias cs="create-script" ialias cs="create-script"
ialias daily="run create-daily next" ialias daily="run create-daily next"
ialias fetch="git fetch --all --jobs=4 --progress --prune"
ialias ls="lsd" ialias ls="lsd"
ialias pull="git pull --autostash --jobs=4 --summary origin"
ialias rebase="git rebase --autostash --stat"
ialias reset="git reset --hard; git clean -fd"
ialias run="./run" ialias run="./run"
ialias s="secrets" ialias s="secrets"
ialias secrets="doppler --project \"$(whoami)\" run" ialias secrets="doppler --project \"$(whoami)\" run"
@ -208,8 +204,6 @@
ialias sz="source ~/.config/zsh/.zshrc" ialias sz="source ~/.config/zsh/.zshrc"
ialias tag="tag-release" ialias tag="tag-release"
ialias uncommit="git reset --soft HEAD^"; ialias uncommit="git reset --soft HEAD^";
ialias update="fetch && rebase"
ialias wip="git add . && git commit -m 'wip'";
ialias wt="git worktree" ialias wt="git worktree"
balias lh3="xdg-open http://localhost:3000" balias lh3="xdg-open http://localhost:3000"
balias lh8="xdg-open http://localhost:8000" balias lh8="xdg-open http://localhost:8000"