From 4c8a1ba2141f0e22ad4d294b9058869628ff4fc1 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 24 Oct 2019 00:02:55 +0200 Subject: Add aliases for new git switch/restore commands (v2.23) --- user/settings/git.nix | 2 ++ user/settings/zsh.nix | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/user/settings/git.nix b/user/settings/git.nix index 503b9e3f..18a40644 100644 --- a/user/settings/git.nix +++ b/user/settings/git.nix @@ -60,6 +60,8 @@ ci = "commit"; br = "branch"; co = "checkout"; + sw = "switch"; + rs = "restore"; lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'"; pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'"; lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'"; diff --git a/user/settings/zsh.nix b/user/settings/zsh.nix index 79384634..7a032b37 100644 --- a/user/settings/zsh.nix +++ b/user/settings/zsh.nix @@ -211,7 +211,8 @@ in gsh = "git show"; gsm = "git submodule"; gci = "git commit"; - gco = "git checkout"; + gx = "git restore"; + gb = "git switch"; gbr = "git br"; gbrc = "git checkout -b"; gbrd = "git branch --delete"; -- cgit 1.4.1